Merge branch 'main' into feat/lw-10725-add-more-field-cosigners

input-output-hk · Jul 15, 2024 · 2729059 · 2729059
2 parents b78bb1d + 29e9e84
commit 2729059
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/shared/build/action.yml b/.github/shared/build/action.yml
@@ -51,9 +51,7 @@ runs:
       shell: bash
       id: check-build-exists
       run: |
-        ART_ID=$(curl https://api.github.com/repos/input-output-hk/lace/actions/artifacts?name=lace-build-${{ github.sha }} | jq -r .artifacts[0].id)
-        ART_ID1=$(curl https://api.github.com/repos/input-output-hk/lace/actions/artifacts?name=lace-build-${{ github.sha }})
-        echo "ART_ID1: $ART_ID1"
+        ART_ID=$(curl -H "Authorization: Bearer ${{ inputs.GITHUB_TOKEN }}" https://api.github.com/repos/input-output-hk/lace/actions/artifacts?name=lace-build-${{ github.sha }} | jq -r .artifacts[0].id)
         if [ "$ART_ID" == "null" ]; then
           echo "No Lace build artifact found, will build it now"
           echo "build_exists=false" >> $GITHUB_OUTPUT
@@ -108,3 +106,4 @@ runs:
       with:
         name: lace-build-${{ github.sha }}
         path: ./apps/browser-extension-wallet/dist
+        overwrite: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -124,7 +124,6 @@ jobs:
   build_extension:
     name: Build Lace browser extension
     runs-on: ubuntu-22.04
-#    needs: prepare
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/e2e-tests-linux-split.yml b/.github/workflows/e2e-tests-linux-split.yml
@@ -70,13 +70,13 @@ jobs:
           ART_ID=$(curl https://api.github.com/repos/input-output-hk/lace/actions/artifacts?name=lace-build-${{ github.sha }} | jq -r .artifacts[0].id)
           if [ "$ART_ID" == "null" ]; then
             echo "No Lace build artifact found, will build it now"
-            exit 0
+            echo "build_exists=false" >> $GITHUB_OUTPUT
           else
             echo "Lace build artifact found no need to build again"
-            exit 1
+            echo "build_exists=true" >> $GITHUB_OUTPUT
           fi
       - name: Build dist version of Lace
-        if: success()
+        if: steps.check-build-exists.outputs.build_exists == 'false'
         uses: ./.github/shared/build
         with:
           LACE_EXTENSION_KEY: ${{ secrets.MANIFEST_PUBLIC_KEY }}