From 3269fe91364e38124e35822094870e08fc45c7a1 Mon Sep 17 00:00:00 2001 From: Pranav Malewadkar Date: Mon, 16 Dec 2024 15:33:36 -0800 Subject: [PATCH 1/3] fix(ci): npm install canary test failure --- .../workflows/callable-canary-sampleapp-tests.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/callable-canary-sampleapp-tests.yml b/.github/workflows/callable-canary-sampleapp-tests.yml index 0ff50fa567a..6016ba0bb8e 100644 --- a/.github/workflows/callable-canary-sampleapp-tests.yml +++ b/.github/workflows/callable-canary-sampleapp-tests.yml @@ -48,8 +48,8 @@ jobs: run: | cp credentials-auth.spec.js new-react-app.spec.js working-directory: amplify-js-samples-staging/cypress/integration/auth - - name: Install amplify - run: npm install amplify + - name: Install dependencies + run: npm install working-directory: amplify-js-samples-staging/samples/react/auth/new-react-app - name: Start new application and run test run: | @@ -114,7 +114,7 @@ jobs: working-directory: amplify-js-samples-staging/samples/next/auth/new-next-app - name: Copy files from samples staging repo run: | - rm -r ./samples/next/auth/new-next-app + rm -r ./samples/next/auth/new-next-app cp -r ./samples/next/auth/auth-rsc ./samples/next/auth/new-next-app working-directory: amplify-js-samples-staging - name: Copy test file from samples staging repo @@ -124,11 +124,6 @@ jobs: - name: Install dependencies run: npm install working-directory: amplify-js-samples-staging/samples/next/auth/new-next-app - - name: Install amplify - run: | - npm install -g npm@latest - npm install aws-amplify -legacy-peer-deps - working-directory: amplify-js-samples-staging/samples/next/auth/new-next-app - name: Start application and run test run: | ../amplify-js/scripts/retry-yarn-script.sh -s \ @@ -194,7 +189,7 @@ jobs: working-directory: amplify-js-samples-staging/samples/javascript/datastore/new-javascript-app - name: Copy files from samples staging repo run: | - rm -r ./samples/javascript/datastore/new-javascript-app + rm -r ./samples/javascript/datastore/new-javascript-app cp -r ./samples/javascript/datastore/basic-crud ./samples/javascript/datastore/new-javascript-app working-directory: amplify-js-samples-staging - name: Copy test file from samples staging repo From 14c76eb0ae6ac01a0a1abe826341efdd5f75ab6f Mon Sep 17 00:00:00 2001 From: Pranav Malewadkar Date: Mon, 16 Dec 2024 15:46:51 -0800 Subject: [PATCH 2/3] chore: remove unintended change --- .github/workflows/callable-canary-sampleapp-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/callable-canary-sampleapp-tests.yml b/.github/workflows/callable-canary-sampleapp-tests.yml index 6016ba0bb8e..6f6033a872f 100644 --- a/.github/workflows/callable-canary-sampleapp-tests.yml +++ b/.github/workflows/callable-canary-sampleapp-tests.yml @@ -48,8 +48,8 @@ jobs: run: | cp credentials-auth.spec.js new-react-app.spec.js working-directory: amplify-js-samples-staging/cypress/integration/auth - - name: Install dependencies - run: npm install + - name: Install amplify + run: npm install amplify working-directory: amplify-js-samples-staging/samples/react/auth/new-react-app - name: Start new application and run test run: | From 42fefb12e3d4c3ef9b8e94dbf8b9b605582da90a Mon Sep 17 00:00:00 2001 From: Pranav Malewadkar Date: Mon, 16 Dec 2024 16:05:15 -0800 Subject: [PATCH 3/3] fix: use stable versions of libs --- .github/workflows/callable-canary-sampleapp-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/callable-canary-sampleapp-tests.yml b/.github/workflows/callable-canary-sampleapp-tests.yml index 6f6033a872f..ee06376b43d 100644 --- a/.github/workflows/callable-canary-sampleapp-tests.yml +++ b/.github/workflows/callable-canary-sampleapp-tests.yml @@ -124,6 +124,9 @@ jobs: - name: Install dependencies run: npm install working-directory: amplify-js-samples-staging/samples/next/auth/new-next-app + - name: Install latest stable amplify version + run: npm install aws-amplify@latest @aws-amplify/adapter-nextjs@latest + working-directory: amplify-js-samples-staging/samples/next/auth/new-next-app - name: Start application and run test run: | ../amplify-js/scripts/retry-yarn-script.sh -s \