From 1b196f48195965e4f3c4d36dfeab48d37bbdde30 Mon Sep 17 00:00:00 2001 From: Matteo Pologruto Date: Thu, 13 Oct 2022 16:35:36 +0200 Subject: [PATCH 1/3] Update publish-go-tester-task --- .github/workflows/publish-go-tester-task.yml | 65 +++++++++++--------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/.github/workflows/publish-go-tester-task.yml b/.github/workflows/publish-go-tester-task.yml index f2bc0fc84cd..b730416c4c8 100644 --- a/.github/workflows/publish-go-tester-task.yml +++ b/.github/workflows/publish-go-tester-task.yml @@ -28,7 +28,6 @@ env: PROJECT_NAME: arduino-cli # As defined by the Taskfile's DIST_DIR variable DIST_DIR: dist - BUILDS_ARTIFACT: build-artifacts jobs: run-determination: @@ -54,40 +53,57 @@ jobs: echo "::set-output name=result::$RESULT" - build: - name: Build ${{ matrix.os.name }} + package-name-prefix: needs: run-determination if: needs.run-determination.outputs.result == 'true' runs-on: ubuntu-latest + outputs: + prefix: ${{ steps.calculation.outputs.prefix }} + steps: + - name: package name prefix calculation + id: calculation + run: | + PACKAGE_NAME_PREFIX="test" + if [ "${{ github.event_name }}" = "pull_request" ]; then + PACKAGE_NAME_PREFIX="$PACKAGE_NAME_PREFIX-${{ github.event.number }}" + fi + PACKAGE_NAME_PREFIX="$PACKAGE_NAME_PREFIX-${{ github.sha }}-" + + echo "::set-output name=prefix::$PACKAGE_NAME_PREFIX" + + build: + needs: package-name-prefix + name: Build ${{ matrix.os.name }} + runs-on: ubuntu-latest strategy: matrix: os: - - dist: Windows_32bit + - task: Windows_32bit path: "*Windows_32bit.zip" name: Windows_X86-32 - - dist: Windows_64bit + - task: Windows_64bit path: "*Windows_64bit.zip" name: Windows_X86-64 - - dist: Linux_32bit + - task: Linux_32bit path: "*Linux_32bit.tar.gz" name: Linux_X86-32 - - dist: Linux_64bit + - task: Linux_64bit path: "*Linux_64bit.tar.gz" name: Linux_X86-64 - - dist: Linux_ARMv6 + - task: Linux_ARMv6 path: "*Linux_ARMv6.tar.gz" name: Linux_ARMv6 - - dist: Linux_ARMv7 + - task: Linux_ARMv7 path: "*Linux_ARMv7.tar.gz" name: Linux_ARMv7 - - dist: Linux_ARM64 + - task: Linux_ARM64 path: "*Linux_ARM64.tar.gz" name: Linux_ARM64 - - dist: macOS_64bit + - task: macOS_64bit path: "*macOS_64bit.tar.gz" name: macOS_64 - - dist: macOS_ARM64 + - task: macOS_ARM64 path: "*macOS_ARM64.tar.gz" name: macOS_ARM64 @@ -105,14 +121,11 @@ jobs: - name: Build run: | - PACKAGE_NAME_PREFIX="test" - if [ "${{ github.event_name }}" = "pull_request" ]; then - PACKAGE_NAME_PREFIX="$PACKAGE_NAME_PREFIX-${{ github.event.number }}" - fi - PACKAGE_NAME_PREFIX="$PACKAGE_NAME_PREFIX-${{ github.sha }}-" + PACKAGE_NAME_PREFIX=${{ needs.package-name-prefix.outputs.prefix }} export PACKAGE_NAME_PREFIX - task dist:${{ matrix.os.dist }} + task dist:${{ matrix.os.task }} + # Transfer builds to artifacts job - name: Upload build artifact uses: actions/upload-artifact@v3 with: @@ -120,24 +133,18 @@ jobs: name: ${{ matrix.os.name }} checksums: - needs: build + needs: + - build + - package-name-prefix runs-on: ubuntu-latest steps: - name: Download build artifacts uses: actions/download-artifact@v3 - with: - path: ${{ env.BUILDS_ARTIFACT }} - name: Output checksum - working-directory: ${{ env.BUILDS_ARTIFACT}} run: | - PACKAGE_NAME_PREFIX="test" - if [ "${{ github.event_name }}" = "pull_request" ]; then - PACKAGE_NAME_PREFIX="$PACKAGE_NAME_PREFIX-${{ github.event.number }}" - fi - PACKAGE_NAME_PREFIX="$PACKAGE_NAME_PREFIX-${{ github.sha }}-" - TAG="${PACKAGE_NAME_PREFIX}git-snapshot" + TAG="${{ needs.package-name-prefix.outputs.prefix }}git-snapshot" declare -a artifacts=($(ls -d */)) for artifact in ${artifacts[@]} do @@ -150,5 +157,5 @@ jobs: - name: Upload checksum artifact uses: actions/upload-artifact@v3 with: - path: ${{ env.BUILDS_ARTIFACT }}/*checksums.txt + path: ./*checksums.txt name: checksums From b2d9f954e27fe7abd78fa3feabe6d12727d7c7ba Mon Sep 17 00:00:00 2001 From: Matteo Pologruto Date: Fri, 14 Oct 2022 14:26:29 +0200 Subject: [PATCH 2/3] Update publish-go-nightly-task --- .github/workflows/publish-go-nightly-task.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-go-nightly-task.yml b/.github/workflows/publish-go-nightly-task.yml index b15eb023476..6ddc4e7e7fc 100644 --- a/.github/workflows/publish-go-nightly-task.yml +++ b/.github/workflows/publish-go-nightly-task.yml @@ -173,11 +173,11 @@ jobs: name: ${{ env.ARTIFACT_NAME }} path: ${{ env.DIST_DIR }} - - name: Output checksum + - name: Create checksum file working-directory: ${{ env.DIST_DIR}} run: | TAG="nightly-$(date -u +"%Y%m%d")" - sha256sum ${{ env.PROJECT_NAME }}_${TAG}* >> ${TAG}-checksums.txt + sha256sum ${{ env.PROJECT_NAME }}_${TAG}* > ${TAG}-checksums.txt - name: Upload release files on Arduino downloads servers uses: docker://plugins/s3 From d69d3e371de3ad175bc814c86c066cd015a2fd6d Mon Sep 17 00:00:00 2001 From: Matteo Pologruto Date: Fri, 14 Oct 2022 14:28:33 +0200 Subject: [PATCH 3/3] Update release-go-task --- .github/workflows/release-go-task.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-go-task.yml b/.github/workflows/release-go-task.yml index 56479508b05..8c27721899e 100644 --- a/.github/workflows/release-go-task.yml +++ b/.github/workflows/release-go-task.yml @@ -180,11 +180,11 @@ jobs: name: ${{ env.ARTIFACT_NAME }} path: ${{ env.DIST_DIR }} - - name: Output checksum + - name: Create checksum file working-directory: ${{ env.DIST_DIR}} run: | TAG="${GITHUB_REF/refs\/tags\//}" - sha256sum ${{ env.PROJECT_NAME }}_${TAG}* >> ${TAG}-checksums.txt + sha256sum ${{ env.PROJECT_NAME }}_${TAG}* > ${TAG}-checksums.txt - name: Identify Prerelease # This is a workaround while waiting for create-release action