From 775046b41f553ede607bd76847cf750cd158adcb Mon Sep 17 00:00:00 2001 From: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> Date: Wed, 8 Nov 2023 05:52:19 -0800 Subject: [PATCH 1/5] Remove mailchimp Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> --- premiser-ui/src/LoginPage.tsx | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/premiser-ui/src/LoginPage.tsx b/premiser-ui/src/LoginPage.tsx index e0636edc..c4c8493f 100644 --- a/premiser-ui/src/LoginPage.tsx +++ b/premiser-ui/src/LoginPage.tsx @@ -142,33 +142,6 @@ class LoginPage extends Component { - - - Howdju 2.0 is currently in private gamma. Enter your email to sign - up for updates: - - -
- - - - - Subscribe - - - -
- ); From 171804180a44a746af39a11c84ab6005aee525e2 Mon Sep 17 00:00:00 2001 From: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> Date: Wed, 8 Nov 2023 05:58:46 -0800 Subject: [PATCH 2/5] Use literal for node-version Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> --- .github/workflows/ci.yml | 4 ++-- .github/workflows/deploy-preprod.yml | 5 ++--- .github/workflows/deploy-prod.yml | 5 ++--- .github/workflows/flaky-tests-check.yml | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8d3caf1..ac434137 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - name: Setup Node.JS uses: actions/setup-node@v3 with: - node-version: $NODE_VERSION + node-version: 18.18.2 cache: "yarn" - name: Install Yarn run: | @@ -127,7 +127,7 @@ jobs: - name: Setup Node.JS uses: actions/setup-node@v3 with: - node-version: $NODE_VERSION + node-version: 18.18.2 cache: "yarn" - name: Install Yarn run: | diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index c40238dd..e6d26b80 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -45,11 +45,10 @@ jobs: - name: Node.js uses: actions/setup-node@v3 with: - node-version: $NODE_VERSION + node-version: 18.18.2 - name: Corepack # Enables yarn v2 - run: - corepack enable + run: corepack enable yarn set version $YARN_VERSION - name: Yarn install run: yarn install diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index fa25493e..79e903c7 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -24,11 +24,10 @@ jobs: aws-region: ${{ env.AWS_REGION }} - uses: actions/setup-node@v3 with: - node-version: $NODE_VERSION + node-version: 18.18.2 - name: Corepack # Enables yarn v2 - run: - corepack enable + run: corepack enable yarn set version $YARN_VERSION - name: Yarn install run: yarn install diff --git a/.github/workflows/flaky-tests-check.yml b/.github/workflows/flaky-tests-check.yml index 878256c3..a2ae3739 100644 --- a/.github/workflows/flaky-tests-check.yml +++ b/.github/workflows/flaky-tests-check.yml @@ -36,7 +36,7 @@ jobs: - name: Setup Node.JS uses: actions/setup-node@v3 with: - node-version: $NODE_VERSION + node-version: 18.18.2 cache: "yarn" - name: Install Yarn run: | From 40b08699fafb54e09be0f0d6f240e911eceda4cb Mon Sep 17 00:00:00 2001 From: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> Date: Wed, 8 Nov 2023 06:04:16 -0800 Subject: [PATCH 3/5] Use correct GH action syntax for repository variables Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/deploy-preprod.yml | 4 ++-- .github/workflows/deploy-prod.yml | 4 ++-- .github/workflows/flaky-tests-check.yml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac434137..c80c832f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,12 +31,12 @@ jobs: - name: Setup Node.JS uses: actions/setup-node@v3 with: - node-version: 18.18.2 + node-version: ${{ vars.NODE_VERSION }} cache: "yarn" - name: Install Yarn run: | corepack enable - yarn set version $YARN_VERSION + yarn set version ${{ vars.NODE_VERSION }} - name: Install dependencies run: yarn install - name: Lint @@ -127,12 +127,12 @@ jobs: - name: Setup Node.JS uses: actions/setup-node@v3 with: - node-version: 18.18.2 + node-version: ${{ vars.NODE_VERSION }} cache: "yarn" - name: Install Yarn run: | corepack enable - yarn set version $YARN_VERSION + yarn set version ${{ vars.NODE_VERSION }} - name: Install dependencies run: yarn install - name: Changed-files test coverage diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index e6d26b80..4bdcc08d 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -45,11 +45,11 @@ jobs: - name: Node.js uses: actions/setup-node@v3 with: - node-version: 18.18.2 + node-version: ${{ vars.NODE_VERSION }} - name: Corepack # Enables yarn v2 run: corepack enable - yarn set version $YARN_VERSION + yarn set version ${{ vars.NODE_VERSION }} - name: Yarn install run: yarn install - name: Deploy API diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 79e903c7..e5603663 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -24,11 +24,11 @@ jobs: aws-region: ${{ env.AWS_REGION }} - uses: actions/setup-node@v3 with: - node-version: 18.18.2 + node-version: ${{ vars.NODE_VERSION }} - name: Corepack # Enables yarn v2 run: corepack enable - yarn set version $YARN_VERSION + yarn set version ${{ vars.NODE_VERSION }} - name: Yarn install run: yarn install - name: Update API Lambda Alias diff --git a/.github/workflows/flaky-tests-check.yml b/.github/workflows/flaky-tests-check.yml index a2ae3739..89b86a71 100644 --- a/.github/workflows/flaky-tests-check.yml +++ b/.github/workflows/flaky-tests-check.yml @@ -36,12 +36,12 @@ jobs: - name: Setup Node.JS uses: actions/setup-node@v3 with: - node-version: 18.18.2 + node-version: ${{ vars.NODE_VERSION }} cache: "yarn" - name: Install Yarn run: | corepack enable - yarn set version $YARN_VERSION + yarn set version ${{ vars.NODE_VERSION }} - name: Install dependencies run: yarn install - name: Check flaky tests From 49ec9640933284f05dc0bb8cb3af3298d822b3f6 Mon Sep 17 00:00:00 2001 From: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> Date: Wed, 8 Nov 2023 06:06:43 -0800 Subject: [PATCH 4/5] Fix reference to YARN_VERSION Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> --- .github/workflows/ci.yml | 4 ++-- .github/workflows/deploy-preprod.yml | 2 +- .github/workflows/deploy-prod.yml | 2 +- .github/workflows/flaky-tests-check.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c80c832f..98a04699 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: - name: Install Yarn run: | corepack enable - yarn set version ${{ vars.NODE_VERSION }} + yarn set version ${{ vars.YARN_VERSION }} - name: Install dependencies run: yarn install - name: Lint @@ -132,7 +132,7 @@ jobs: - name: Install Yarn run: | corepack enable - yarn set version ${{ vars.NODE_VERSION }} + yarn set version ${{ vars.YARN_VERSION }} - name: Install dependencies run: yarn install - name: Changed-files test coverage diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 4bdcc08d..761e27f9 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -49,7 +49,7 @@ jobs: - name: Corepack # Enables yarn v2 run: corepack enable - yarn set version ${{ vars.NODE_VERSION }} + yarn set version ${{ vars.YARN_VERSION }} - name: Yarn install run: yarn install - name: Deploy API diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index e5603663..0cdf68a4 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -28,7 +28,7 @@ jobs: - name: Corepack # Enables yarn v2 run: corepack enable - yarn set version ${{ vars.NODE_VERSION }} + yarn set version ${{ vars.YARN_VERSION }} - name: Yarn install run: yarn install - name: Update API Lambda Alias diff --git a/.github/workflows/flaky-tests-check.yml b/.github/workflows/flaky-tests-check.yml index 89b86a71..1a68497e 100644 --- a/.github/workflows/flaky-tests-check.yml +++ b/.github/workflows/flaky-tests-check.yml @@ -41,7 +41,7 @@ jobs: - name: Install Yarn run: | corepack enable - yarn set version ${{ vars.NODE_VERSION }} + yarn set version ${{ vars.YARN_VERSION }} - name: Install dependencies run: yarn install - name: Check flaky tests From ecb0523e2ef7783a2d08b26ca120cd8e067586f2 Mon Sep 17 00:00:00 2001 From: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> Date: Wed, 8 Nov 2023 06:10:43 -0800 Subject: [PATCH 5/5] Fix YAML syntax Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> --- .github/workflows/deploy-preprod.yml | 3 ++- .github/workflows/deploy-prod.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 761e27f9..894f3e4b 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -48,7 +48,8 @@ jobs: node-version: ${{ vars.NODE_VERSION }} - name: Corepack # Enables yarn v2 - run: corepack enable + run: | + corepack enable yarn set version ${{ vars.YARN_VERSION }} - name: Yarn install run: yarn install diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 0cdf68a4..72e0e735 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -27,7 +27,8 @@ jobs: node-version: ${{ vars.NODE_VERSION }} - name: Corepack # Enables yarn v2 - run: corepack enable + run: | + corepack enable yarn set version ${{ vars.YARN_VERSION }} - name: Yarn install run: yarn install