diff --git a/.github/actions/build-linux/action.yaml b/.github/actions/build-linux/action.yaml index d504247f5..a2c4f0bec 100644 --- a/.github/actions/build-linux/action.yaml +++ b/.github/actions/build-linux/action.yaml @@ -27,26 +27,25 @@ runs: # - name: move binary to target directory # run: | - # mkdir -p dist-linux - # mv src-tauri/target/release/algokit-explorer dist-linux + # mkdir -p dist + # mv src-tauri/target/release/algokit-explorer dist # shell: bash - name: HACK - move binary to target directory run: | - mkdir -p dist-linux - mv src/assets/react.svg dist-linux/algokit-explorer + mkdir -p dist + mv src/assets/react.svg dist/algokit-explorer shell: bash - name: Generate snapcraft.yaml run: | - ./scripts/snap/create-snapcraft-yaml.sh ${{ github.workspace }} ${{ inputs.release-version }} "stable" "dist-linux" + ./scripts/snap/create-snapcraft-yaml.sh ${{ github.workspace }} ${{ inputs.release-version }} "stable" "dist" shell: bash - name: Upload binary as artifact id: upload-artifact uses: actions/upload-artifact@v4 with: - name: algokit-explorer-linux-${{ runner.arch }} - path: | - dist-linux/algokit-explorer - snap/snapcraft.yaml + if-no-files-found: error + name: algokit-explorer-${{ runner.arch }} + path: dist diff --git a/.github/actions/publish-linux-snap/action.yaml b/.github/actions/publish-linux-snap/action.yaml index 25a83b089..69705ab32 100644 --- a/.github/actions/publish-linux-snap/action.yaml +++ b/.github/actions/publish-linux-snap/action.yaml @@ -18,7 +18,7 @@ runs: - name: Build snap uses: snapcore/action-build@v1 with: - path: linux-artifacts + path: ${{ inputs.artifacts-path }} snapcraft-args: --target-arch amd64 - name: Upload binary as artifact @@ -27,7 +27,7 @@ runs: with: name: algokit-explorer-linux-snap path: | - linux-artifacts/*.snap + ${{ inputs.artifacts-path }}/*.snap #TODO: in this action, we only publish the snap as an artifact for testing purposes # once we have the release token, we will publish the snap to Snap Store diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 701262f0b..6b54a2ad2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -117,14 +117,16 @@ jobs: with: fetch-depth: 0 - - uses: actions/download-artifact@v4 + - name: Download Linux artifacts + uses: actions/download-artifact@v4 with: + name: algokit-explorer-linux merge-multiple: true - path: artifacts + path: linux-artifacts - name: publish Linux Snap if: ${{ runner.os == 'Linux' }} uses: ./.github/actions/publish-linux-snap with: - artifacts-path: artifacts + artifacts-path: linux-artifacts linux-artifact-name: ${{ needs.build-tauri.outputs.linux-artifact-name }} diff --git a/scripts/snap/create-snapcraft-yaml.sh b/scripts/snap/create-snapcraft-yaml.sh index 636175345..66ca64408 100755 --- a/scripts/snap/create-snapcraft-yaml.sh +++ b/scripts/snap/create-snapcraft-yaml.sh @@ -53,4 +53,4 @@ apps: - wayland EOF -echo "snapcraft.yaml has been created at ${DESTINATION_DIR}/snap/snapcraft.yaml" +echo "snapcraft.yaml has been created at ${DESTINATION_DIR}/snapcraft.yaml"