Merge branch 'develop' into sidv/argosInvestigation

* develop:
  Upgrade @argos-ci

package.json

@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@applitools/eyes-cypress": "^3.44.4",
-    "@argos-ci/cypress": "^2.1.0",
+    "@argos-ci/cypress": "^2.2.2",
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.7",
     "@cspell/eslint-plugin": "^8.8.4",

patches/@argos-ci__core.patch

@@ -1,14 +1,39 @@
 diff --git a/dist/index.mjs b/dist/index.mjs
-index 749b5d65546011b9d87d0a28dd86c1de091efe47..c6630f190eb371a5727f1b37325e848f96c02bd0 100644
+index 5cbaad945826960a6b77b44bf9661e1c2523c16d..6df2474578cdcf2b6d26330bd23dbb48a24ecafe 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
-@@ -722,6 +722,9 @@ const createArgosLegacyAPIClient = (options)=>{
+@@ -914,13 +914,7 @@ async function uploadFilesToS3(files) {
-             });
+     await uploadFilesToS3(uploadFiles);
-             return response.data;
+     // Update build
-         } catch (error) {
+     debug("Updating build");
-+            console.error(error.response);
+-    const uploadBuildResponse = await apiClient.PUT("/builds/{buildId}", {
-+            console.error(error.response.details);
+-        params: {
-+            console.error(JSON.stringify(error.response.details, null, 2));
+-            path: {
-             if (error?.response?.data?.error?.message) {
+-                buildId: result.build.id
-                 // @ts-ignore
+-            }
-                 throw new Error(error.response.data.error.message, {
+-        },
+-        body: {
++    const body = {
+             screenshots: screenshots.map((screenshot)=>({
+                     key: screenshot.hash,
+                     name: screenshot.name,
+@@ -933,9 +927,18 @@ async function uploadFilesToS3(files) {
+             parallelTotal: config.parallelTotal,
+             parallelIndex: config.parallelIndex,
+             metadata: params.metadata
+-        }
++        };
++    const uploadBuildResponse = await apiClient.PUT("/builds/{buildId}", {
++        params: {
++            path: {
++                buildId: result.build.id
++            }
++        },
++        body
+     });
+     if (uploadBuildResponse.error) {
++        console.error(JSON.stringify({body, buildId: result.build.id}, null, 2))
++        console.error(JSON.stringify(uploadBuildResponse, null, 2))
+         throwAPIError(uploadBuildResponse);
+     }
+     return {

pnpm-lock.yaml

@@ -6,7 +6,7 @@ settings:
 
 patchedDependencies:
   '@argos-ci/core':
-    hash: h747yhlouzzcfgu7wmk6ozsy54
+    hash: ew23wb5pwcjiy5eope7s6dj3ty
     path: patches/@argos-ci__core.patch
   roughjs:
     hash: vxb6t6fqvzyhwhtjiliqr25jyq
@@ -20,8 +20,8 @@ importers:
         specifier: ^3.44.4
         version: 3.44.7(encoding@0.1.13)(typescript@5.4.5)
       '@argos-ci/cypress':
-        specifier: ^2.1.0
+        specifier: ^2.2.2
-        version: 2.1.2(cypress@13.14.1)
+        version: 2.2.2(cypress@13.14.1)
       '@changesets/changelog-github':
         specifier: ^0.5.0
         version: 0.5.0(encoding@0.1.13)
@@ -765,20 +765,20 @@ packages:
     resolution: {integrity: sha512-qgJqx2yjlJBf79YyFehf1nSp4AXOdzJn3POQyg8CMWV0YH6HsjAfJjYaNrbXFcGYCSpPEJGhGehxC7GVKHX3YA==}
     engines: {node: '>=12.13.0'}
 
-  '@argos-ci/api-client@0.2.0':
+  '@argos-ci/api-client@0.5.0':
-    resolution: {integrity: sha512-stqugeAtbHjD2MwezvgJ4hU0HvlEGwGDVsJvUUD4YoRS0putS8yFjXuempkc90XGeHDEfYZgvG372rcK7/FClA==}
+    resolution: {integrity: sha512-syJJmvLtJKQYXDmGYRb+ZKpzpSk/dReqhZZm2tnWn7ThxHaJRJ7Wu3J5nqDpCP3LxoYCVfvV/dmfoJO0v8+PbQ==}
     engines: {node: '>=18.0.0'}
 
-  '@argos-ci/browser@2.1.3':
+  '@argos-ci/browser@2.1.4':
-    resolution: {integrity: sha512-C9/k32HrmkHkUT9KrhHuOvlli1ibPGE1nkToC6+t4cAmbJCIU8HFrVa6VG2UT3xJjLht+gpqvPwTbJAsCRXv3A==}
+    resolution: {integrity: sha512-GursnbWL01wN92hRgEsa0c55ih9Sp6qGeYIXFWP4o42FDzm98LbxIy2e1WS+ezP+gBwsSBEMBTGcGCSSmVzacg==}
     engines: {node: '>=18.0.0'}
 
-  '@argos-ci/core@2.5.0':
+  '@argos-ci/core@2.8.1':
-    resolution: {integrity: sha512-xNHKWzuSLHXm/5fhdEQv8zUwExeEkYzw6CV/Ha9rUBBTPomZL5CNxpXQ/ww1AA4mRC5dq3CfgreRq8qj7HQMVQ==}
+    resolution: {integrity: sha512-5ygruMnfQ3OY6LvywnwTycZFg6oTG5UYvPCVdwQiOh+8FgUZUyJge7QBVfeWW+qC0UXFMo+f3eTQ5YFvTwc0ZA==}
     engines: {node: '>=18.0.0'}
 
-  '@argos-ci/cypress@2.1.2':
+  '@argos-ci/cypress@2.2.2':
-    resolution: {integrity: sha512-J+G7EoyQTz6ev9yZBKpl1lRuizUwrX4ZMfqfyB9fDtPhyNcW3V5nTZh2iMBsNW/4hDnL5SQ5Tge5eJfuGkffgA==}
+    resolution: {integrity: sha512-lwXu6y5DcP4ufYQEom4JtHSHjIYul6+GB4pniC8S97mfXLYq6KITJD4JHbrnfIiQGuV1xNPIaBc4MWX+atFDuw==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       cypress: ^12.0.0 || ^13.0.0
@@ -9943,15 +9943,15 @@ snapshots:
 
   '@applitools/utils@1.7.4': {}
 
-  '@argos-ci/api-client@0.2.0':
+  '@argos-ci/api-client@0.5.0':
     dependencies:
       openapi-fetch: 0.11.1
 
-  '@argos-ci/browser@2.1.3': {}
+  '@argos-ci/browser@2.1.4': {}
 
-  '@argos-ci/core@2.5.0(patch_hash=h747yhlouzzcfgu7wmk6ozsy54)':
+  '@argos-ci/core@2.8.1(patch_hash=ew23wb5pwcjiy5eope7s6dj3ty)':
     dependencies:
-      '@argos-ci/api-client': 0.2.0
+      '@argos-ci/api-client': 0.5.0
       '@argos-ci/util': 2.1.1
       axios: 1.7.5(debug@4.3.7)
       convict: 6.2.4
@@ -9962,10 +9962,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@argos-ci/cypress@2.1.2(cypress@13.14.1)':
+  '@argos-ci/cypress@2.2.2(cypress@13.14.1)':
     dependencies:
-      '@argos-ci/browser': 2.1.3
+      '@argos-ci/browser': 2.1.4
-      '@argos-ci/core': 2.5.0(patch_hash=h747yhlouzzcfgu7wmk6ozsy54)
+      '@argos-ci/core': 2.8.1(patch_hash=ew23wb5pwcjiy5eope7s6dj3ty)
       '@argos-ci/util': 2.1.1
       cypress: 13.14.1
       cypress-wait-until: 3.0.2