diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 939bf3fb..6a171e6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -139,17 +139,14 @@ env: container: | null job-transfer-artifact-suffix: ARM_64bit - mergeable-channel-file: 'true' + mergeable-channel-file: 'false' artifacts: - - path: '*Linux_arm64.zip' - name: Linux_arm64_zip - - path: '*Linux_arm64.AppImage' - name: Linux_arm64_app_image + - path: '*ARM_64bit.tar.gz' + name: ARM_64bit_tarball PAID_RUNNER_BUILD_DATA: | # This system was implemented to allow selective use of paid GitHub-hosted runners, due to the Apple Silicon runner # incurring a charge at that time. Free Apple Silicon runners are now available so the configuration was moved to # `BASE_BUILD_DATA`, but the system was left in place for future use. - jobs: run-determination: runs-on: ubuntu-latest @@ -172,9 +169,7 @@ jobs: # There is no need to run the other jobs. RESULT="false" fi - echo "result=$RESULT" >> $GITHUB_OUTPUT - build-type-determination: needs: run-determination if: needs.run-determination.outputs.result == 'true' @@ -211,13 +206,11 @@ jobs: is_nightly="false" channel_name="nightly" fi - echo "is-release=$is_release" >> $GITHUB_OUTPUT echo "is-nightly=$is_nightly" >> $GITHUB_OUTPUT echo "channel-name=$channel_name" >> $GITHUB_OUTPUT # Only attempt upload to Amazon S3 if the credentials are available. echo "publish-to-s3=${{ secrets.AWS_ROLE_ARN != '' }}" >> $GITHUB_OUTPUT - select-targets: needs: build-type-determination runs-on: ubuntu-latest @@ -244,7 +237,6 @@ jobs: --output-format json \ '[.[].config]' )" - artifact_matrix="$( ( echo "${{ env.BASE_BUILD_DATA }}"; @@ -254,11 +246,9 @@ jobs: --output-format json \ 'map(.artifacts[] + (.config | pick(["job-transfer-artifact-suffix"])))' )" - # The build matrix produces two macOS jobs (x86 and ARM) so the "channel update info files" # generated by each must be merged. merge_channel_files="true" - else build_matrix="$( echo "${{ env.BASE_BUILD_DATA }}" | \ @@ -266,31 +256,25 @@ jobs: --output-format json \ '[.[].config]' )" - artifact_matrix="$( echo "${{ env.BASE_BUILD_DATA }}" | \ yq \ --output-format json \ 'map(.artifacts[] + (.config | pick(["job-transfer-artifact-suffix"])))' )" - merge_channel_files="false" fi - # Set workflow step outputs. # See: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings delimiter="$RANDOM" echo "build-matrix<<$delimiter" >> $GITHUB_OUTPUT echo "$build_matrix" >> $GITHUB_OUTPUT echo "$delimiter" >> $GITHUB_OUTPUT - delimiter="$RANDOM" echo "artifact-matrix<<$delimiter" >> $GITHUB_OUTPUT echo "$artifact_matrix" >> $GITHUB_OUTPUT echo "$delimiter" >> $GITHUB_OUTPUT - echo "merge-channel-files=$merge_channel_files" >> $GITHUB_OUTPUT - build: name: build (${{ matrix.config.name }}) needs: @@ -331,7 +315,6 @@ jobs: if: runner.os == 'Windows' && matrix.config.working-directory run: | if not exist "${{ matrix.config.working-directory }}" mklink /d "${{ matrix.config.working-directory }}" "C:\actions-runner\_work\arduino-ide\arduino-ide" - - name: Checkout uses: actions/checkout@v4 @@ -352,7 +335,6 @@ jobs: install \ --global \ "yarn@${{ env.YARN_VERSION }}" - - name: Install Python 3.x if: fromJSON(matrix.config.container) == null && runner.name != 'WINDOWS-SIGN-PC' uses: actions/setup-python@v5 @@ -392,15 +374,12 @@ jobs: export CSC_KEY_PASSWORD="${{ secrets[matrix.config.certificate-password-secret] }}" export CSC_FOR_PULL_REQUEST=true fi - npx node-gyp install yarn install - yarn --cwd arduino-ide-extension build yarn --cwd electron-app rebuild yarn --cwd electron-app build yarn --cwd electron-app package - # Both macOS jobs generate a "channel update info file" with same path and name. The second job to complete would # overwrite the file generated by the first in the workflow artifact. - name: Stage channel file for merge @@ -414,11 +393,9 @@ jobs: mv \ "${{ env.BUILD_ARTIFACTS_PATH }}/${{ needs.build-type-determination.outputs.channel-name }}-mac.yml" \ "${staged_channel_files_path}/${{ needs.build-type-determination.outputs.channel-name }}-mac-${{ runner.arch }}.yml" - # Set workflow environment variable for use in other steps. # See: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable echo "STAGED_CHANNEL_FILES_PATH=$staged_channel_files_path" >> "$GITHUB_ENV" - - name: Upload staged-for-merge channel file artifact uses: actions/upload-artifact@v4 if: > @@ -440,7 +417,6 @@ jobs: shell: cmd run: | rmdir /s /q "${{ matrix.config.working-directory }}\${{ env.BUILD_ARTIFACTS_PATH }}" - merge-channel-files: needs: - build-type-determination @@ -454,7 +430,6 @@ jobs: run: | # See: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable echo "CHANNEL_FILES_PATH=${{ runner.temp }}/channel-files" >> "$GITHUB_ENV" - - name: Checkout uses: actions/checkout@v4 @@ -493,7 +468,6 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev - - name: Install dependencies run: yarn @@ -503,7 +477,6 @@ jobs: ./scripts/merge-channel-files.js \ --channel "${{ needs.build-type-determination.outputs.channel-name }}" \ --input "${{ env.CHANNEL_FILES_PATH }}" - - name: Upload merged channel files job transfer artifact uses: actions/upload-artifact@v4 with: @@ -570,16 +543,13 @@ jobs: fi fi echo -e "$BODY" - # Set workflow step output # See: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings DELIMITER="$RANDOM" echo "BODY<<$DELIMITER" >> $GITHUB_OUTPUT echo "$BODY" >> $GITHUB_OUTPUT echo "$DELIMITER" >> $GITHUB_OUTPUT - echo "$BODY" > CHANGELOG.txt - - name: Upload changelog job transfer artifact if: needs.build-type-determination.outputs.is-nightly == 'true' uses: actions/upload-artifact@v4 @@ -630,7 +600,6 @@ jobs: - name: Publish Nightly [S3] run: | aws s3 sync ${{ env.ARTIFACTS_FOLDER }} s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-ide/nightly - release: needs: - build-type-determination @@ -668,7 +637,6 @@ jobs: id: tag_name run: | echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT - - name: Publish Release [GitHub] uses: svenstaro/upload-release-action@2.9.0 with: @@ -690,7 +658,6 @@ jobs: if: needs.build-type-determination.outputs.publish-to-s3 == 'true' run: | aws s3 sync ${{ env.ARTIFACTS_FOLDER }} s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-ide - clean: # This job must run after all jobs that use the transfer artifact. needs: