Merge branch 'main' into fix/missed-package-dependencies

aws-amplify · Jan 10, 2025 · 0cd4783 · 0cd4783
2 parents 2bb01f3 + f2a0b74
commit 0cd4783
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 5 deletions.
diff --git a/.github/actions/load-verdaccio-with-amplify-js/action.yml b/.github/actions/load-verdaccio-with-amplify-js/action.yml
@@ -49,10 +49,11 @@ runs:
         yarn info aws-amplify@unstable description
         npm info aws-amplify@unstable version
     - name: Upload artifact
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 https://github.com/actions/upload-artifact/commit/0b7f8abb1508181956e8e162db84b466c27e18ce
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: failure()
       with:
         name: ${{ inputs.test_name }}-npm-log
         if-no-files-found: ignore
         path: /Users/runner/.npm/_logs/
         retention-days: 3
+        overwrite: true
diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
@@ -425,6 +425,13 @@ tests:
     sample_name: [data-client-gen2]
     spec: data-client-gen2
     browser: [chrome] # Issues using Auth category / setting secure cookies in FF using Cypress with a Next.js app. Manual testing in FF works as expected
+  - test_name: integ_next_api_multi_endpoint_gen2
+    desc: Next.js Multi Endpoint Gen 2
+    framework: next
+    category: api
+    sample_name: [multi-endpoint-gen2]
+    spec: multi-endpoint-gen2
+    browser: [chrome]
   - test_name: integ_react_rest_api
     desc: 'Vite + React REST API'
     framework: vite
@@ -625,7 +632,7 @@ tests:
     browser: *minimal_browser_list
     env:
       NEXT_PUBLIC_BACKEND_CONFIG: resum-signin
-      
+
   # DISABLED Angular/Vue tests:
   # TODO: delete tests or add custom ui logic to support them.
 

diff --git a/.github/workflows/callable-canary-e2e-tests.yml b/.github/workflows/callable-canary-e2e-tests.yml
@@ -138,7 +138,7 @@ jobs:
         working-directory: amplify-js-samples-staging
         shell: bash
       - name: Upload artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 https://github.com/actions/upload-artifact/commit/0b7f8abb1508181956e8e162db84b466c27e18ce
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         if: failure()
         with:
           name: ${{ inputs.test_name }}
@@ -147,3 +147,4 @@ jobs:
             amplify-js-samples-staging/cypress/videos
             amplify-js-samples-staging/cypress/screenshots
           retention-days: 14
+          overwrite: true
diff --git a/.github/workflows/callable-e2e-test-headless.yml b/.github/workflows/callable-e2e-test-headless.yml
@@ -65,7 +65,7 @@ jobs:
           -n $E2E_RETRY_COUNT
 
       - name: Upload artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 https://github.com/actions/upload-artifact/commit/0b7f8abb1508181956e8e162db84b466c27e18ce
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         if: failure()
         with:
           name: ${{ inputs.test_name }}
@@ -74,3 +74,4 @@ jobs:
             amplify-js-samples-staging/cypress/videos
             amplify-js-samples-staging/cypress/screenshots
           retention-days: 14
+          overwrite: true
diff --git a/.github/workflows/callable-e2e-test.yml b/.github/workflows/callable-e2e-test.yml
@@ -148,7 +148,7 @@ jobs:
             yarn "$E2E_YARN_SCRIPT" "$E2E_YARN_SCRIPT_ARGS"
           fi
       - name: Upload artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 https://github.com/actions/upload-artifact/commit/0b7f8abb1508181956e8e162db84b466c27e18ce
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         if: failure()
         with:
           name: ${{ inputs.test_name }}
@@ -157,3 +157,4 @@ jobs:
             amplify-js-samples-staging/cypress/videos
             amplify-js-samples-staging/cypress/screenshots
           retention-days: 14
+          overwrite: true
diff --git a/packages/geo/__tests__/testData.ts b/packages/geo/__tests__/testData.ts
@@ -58,6 +58,7 @@ export const TestPlacePascalCase = {
 	Geometry: {
 		Point: [2345, 6789],
 	},
+	Interpolated: false,
 	Label: "don't try to label me",
 	Municipality: 'Muni',
 	Neighborhood: 'hay',

diff --git a/packages/geo/src/types/Geo.ts b/packages/geo/src/types/Geo.ts
@@ -73,6 +73,7 @@ export interface Place {
 	addressNumber?: string;
 	country?: string;
 	geometry: PlaceGeometry | undefined;
+	interpolated?: boolean;
 	label?: string;
 	municipality?: string;
 	neighborhood?: string;