From b1bfc7303c45ae2a43ea4bf8476ca9bc83a1ad7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20Garc=C3=ADa=20Veytia=20=28Puerco=29?= Date: Wed, 29 Jul 2026 14:40:38 -0600 Subject: [PATCH 1/2] Remove winget publishing job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow up to https://github.com/scala/scala3/pull/26595#pullrequestreview-4745110094 This PR removes the winget publishing job from the release pipeline. Signed-off-by: Adolfo GarcĂ­a Veytia (Puerco) --- .github/workflows/publish-winget.yml | 38 ---------------------------- .github/workflows/releases.yml | 8 ------ 2 files changed, 46 deletions(-) delete mode 100644 .github/workflows/publish-winget.yml diff --git a/.github/workflows/publish-winget.yml b/.github/workflows/publish-winget.yml deleted file mode 100644 index 363ff7ace871..000000000000 --- a/.github/workflows/publish-winget.yml +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################################### -### THIS IS A REUSABLE WORKFLOW TO PUBLISH SCALA TO WINGET ### -### HOW TO USE: ### -### - THE RELEASE WORKFLOW SHOULD CALL THIS WORKFLOW ### -### - IT WILL PUBLISH THE MSI TO WINGET ### -### ### -### NOTE: ### -### - WE SHOULD KEEP IN SYNC THE https://github.com/dottybot/winget-pkgs REPOSITORY ### -################################################################################################### - - -name: Publish Scala to winget -run-name: Publish Scala ${{ inputs.version }} to winget - -on: - workflow_call: - inputs: - version: - required: true - type: string - secrets: - DOTTYBOT-TOKEN: - required: true - -jobs: - # Never push to WinGet from a fork, regardless of how this workflow is called - publish: - if: github.repository == 'scala/scala3' - runs-on: windows-latest - steps: - - uses: vedantmgoyal9/winget-releaser@4ffc7888bffd451b357355dc214d43bb9f23917e - with: - identifier : Scala.Scala.3 - version : ${{ inputs.version }} - installers-regex: '\.msi$' - release-tag : ${{ inputs.version }} - fork-user : dottybot - token : ${{ secrets.DOTTYBOT-TOKEN }} \ No newline at end of file diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index fe657dadb11f..806080b7cb23 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -34,14 +34,6 @@ jobs: CONSUMER-KEY: ${{ secrets.SDKMAN_KEY }} CONSUMER-TOKEN: ${{ secrets.SDKMAN_TOKEN }} - publish-winget: - uses: ./.github/workflows/publish-winget.yml - if: false && github.repository == 'scala/scala3' # TODO: Requires setting up initial WinGet package (keep the repository guard when enabling) - with: - version: ${{ inputs.version }} - secrets: - DOTTYBOT-TOKEN: ${{ secrets.DOTTYBOT_WINGET_TOKEN }} - compute-digest: runs-on: ubuntu-latest outputs: From 2bd948d86ed18bdea5c5e178ab63d5ba9a03f595 Mon Sep 17 00:00:00 2001 From: "Adolfo Garcia Veytia (puerco)" Date: Wed, 29 Jul 2026 20:35:48 -0600 Subject: [PATCH 2/2] Fix sbt version in the community builds Pass a specific sbt version to the community Signed-off-by: Adolfo Garcia Veytia (puerco) --- .github/workflows/community-build.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/community-build.yaml b/.github/workflows/community-build.yaml index ca40790106e7..1ebd18bbb782 100644 --- a/.github/workflows/community-build.yaml +++ b/.github/workflows/community-build.yaml @@ -12,6 +12,9 @@ permissions: env: DOTTY_CI_RUN: true + # Fix the SBT runner version to prevent the unpinned action from + # rolling it forward. + SBT_RUNNER_VERSION: '2.0.3' jobs: @@ -30,6 +33,8 @@ jobs: java-version: 17 cache: 'sbt' - uses: sbt/setup-sbt@v1 + with: + sbt-runner-version: ${{ env.SBT_RUNNER_VERSION }} - name: Run Community Build A run: | ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA" @@ -49,6 +54,8 @@ jobs: java-version: 17 cache: 'sbt' - uses: sbt/setup-sbt@v1 + with: + sbt-runner-version: ${{ env.SBT_RUNNER_VERSION }} - name: Run Community Build B run: | ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB" @@ -68,6 +75,8 @@ jobs: java-version: 17 cache: 'sbt' - uses: sbt/setup-sbt@v1 + with: + sbt-runner-version: ${{ env.SBT_RUNNER_VERSION }} - name: Run Community Build C run: | ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"