From 40f45a6ab858277dedf565fd00df2fb7c0ee3439 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 14:05:16 +0000 Subject: [PATCH 1/2] Bump actions/download-artifact from 5 to 6 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5 to 6. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 41 ++++++++++++++++++++++++ .github/workflows/publish-chocolatey.yml | 2 +- .github/workflows/test-chocolatey.yml | 2 +- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f58676c79a40..8f8a9d71a8cc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -715,6 +715,47 @@ jobs: exit 1 fi +<<<<<<< backport-lts-3.3-24271 +======= + - name: Prepare the SDKs + shell: bash + run : | + prepareSDK() { + distroSuffix="$1" + sbtProject="$2" + distDir="$3" + + # Build binaries + ./project/scripts/sbt "all ${sbtProject}/Universal/packageBin ${sbtProject}/Universal/packageZipTarball" + + artifactName="scala3-${{ env.RELEASE_TAG }}${distroSuffix}" + + # Caluclate SHA for each of archive files + for file in "${artifactName}.zip" "${artifactName}.tar.gz"; do + mv ${distDir}/target/universal/$file $file + sha256sum "${file}" > "${file}.sha256" + done + } + prepareSDK "" "dist" "./dist/" + prepareSDK "-aarch64-pc-linux" "dist-linux-aarch64" "./dist/linux-aarch64/" + prepareSDK "-x86_64-pc-linux" "dist-linux-x86_64" "./dist/linux-x86_64/" + prepareSDK "-aarch64-apple-darwin" "dist-mac-aarch64" "./dist/mac-aarch64/" + prepareSDK "-x86_64-apple-darwin" "dist-mac-x86_64" "./dist/mac-x86_64/" + prepareSDK "-x86_64-pc-win32" "dist-win-x86_64" "./dist/win-x86_64/" + + - name: Download MSI package + uses: actions/download-artifact@v6 + with: + name: scala.msi + path: . + - name: Prepare MSI package + shell: bash + run: | + msiInstaller="scala3-${{ env.RELEASE_TAG }}.msi" + mv scala.msi "${msiInstaller}" + sha256sum "${msiInstaller}" > "${msiInstaller}.sha256" + +>>>>>>> d7ff7de Bump actions/download-artifact from 5 to 6 - name: Install GH CLI uses: dev-hanz-ops/install-gh-cli-action@v0.2.1 with: diff --git a/.github/workflows/publish-chocolatey.yml b/.github/workflows/publish-chocolatey.yml index b34f66791413..29ae4422f8f4 100644 --- a/.github/workflows/publish-chocolatey.yml +++ b/.github/workflows/publish-chocolatey.yml @@ -31,7 +31,7 @@ jobs: runs-on: windows-latest steps: - name: Fetch the Chocolatey package from GitHub - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: scala.nupkg - name: Publish the package to Chocolatey diff --git a/.github/workflows/test-chocolatey.yml b/.github/workflows/test-chocolatey.yml index 212af8dae50d..3b2109e88fc5 100644 --- a/.github/workflows/test-chocolatey.yml +++ b/.github/workflows/test-chocolatey.yml @@ -35,7 +35,7 @@ jobs: distribution: temurin java-version: ${{ inputs.java-version }} - name: Download the 'nupkg' from GitHub Artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: scala.nupkg path: ${{ env.CHOCOLATEY-REPOSITORY }} From 42015b30d24c7f13cc84b98ab7393384b18753df Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Mon, 10 Nov 2025 15:06:39 +0100 Subject: [PATCH 2/2] Bump actions/download-artifact from 5 to 6 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5 to 6. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] [Cherry-picked d7ff7de4363d309e3551c1c9b28fbb24834129db][modified] --- .github/workflows/ci.yaml | 41 --------------------------------------- 1 file changed, 41 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8f8a9d71a8cc..f58676c79a40 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -715,47 +715,6 @@ jobs: exit 1 fi -<<<<<<< backport-lts-3.3-24271 -======= - - name: Prepare the SDKs - shell: bash - run : | - prepareSDK() { - distroSuffix="$1" - sbtProject="$2" - distDir="$3" - - # Build binaries - ./project/scripts/sbt "all ${sbtProject}/Universal/packageBin ${sbtProject}/Universal/packageZipTarball" - - artifactName="scala3-${{ env.RELEASE_TAG }}${distroSuffix}" - - # Caluclate SHA for each of archive files - for file in "${artifactName}.zip" "${artifactName}.tar.gz"; do - mv ${distDir}/target/universal/$file $file - sha256sum "${file}" > "${file}.sha256" - done - } - prepareSDK "" "dist" "./dist/" - prepareSDK "-aarch64-pc-linux" "dist-linux-aarch64" "./dist/linux-aarch64/" - prepareSDK "-x86_64-pc-linux" "dist-linux-x86_64" "./dist/linux-x86_64/" - prepareSDK "-aarch64-apple-darwin" "dist-mac-aarch64" "./dist/mac-aarch64/" - prepareSDK "-x86_64-apple-darwin" "dist-mac-x86_64" "./dist/mac-x86_64/" - prepareSDK "-x86_64-pc-win32" "dist-win-x86_64" "./dist/win-x86_64/" - - - name: Download MSI package - uses: actions/download-artifact@v6 - with: - name: scala.msi - path: . - - name: Prepare MSI package - shell: bash - run: | - msiInstaller="scala3-${{ env.RELEASE_TAG }}.msi" - mv scala.msi "${msiInstaller}" - sha256sum "${msiInstaller}" > "${msiInstaller}.sha256" - ->>>>>>> d7ff7de Bump actions/download-artifact from 5 to 6 - name: Install GH CLI uses: dev-hanz-ops/install-gh-cli-action@v0.2.1 with: