diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 93ad30e55f4d..5ee866038010 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -219,7 +219,7 @@ jobs: - name: Check compiler version shell: bash run : | - version=$(./project/scripts/sbt "print scala3-compiler-bootstrapped/version" | tail -n1) + version=$(./project/scripts/sbt "print scala3-compiler-bootstrapped-new/version" | tail -n1) echo "This build version: ${version}" if [ "${version}" != "${{ env.RELEASE_TAG }}" ]; then echo "Compiler version for this build '${version}', does not match tag: ${{ env.RELEASE_TAG }}" @@ -227,6 +227,7 @@ jobs: fi - name: Prepare the SDKs + if: false # TODO: Requires changes to dist targets, to be done before stable release shell: bash run : | prepareSDK() { @@ -253,11 +254,13 @@ jobs: prepareSDK "-x86_64-pc-win32" "dist-win-x86_64" "./dist/win-x86_64/" - name: Download MSI package + if: false # TODO: Requires changes to dist targets, to be done before stable release uses: actions/download-artifact@v6 with: name: scala.msi path: . - name: Prepare MSI package + if: false # TODO: Requires changes to dist targets, to be done before stable release shell: bash run: | msiInstaller="scala3-${{ env.RELEASE_TAG }}.msi" @@ -285,13 +288,14 @@ jobs: --latest=${{ !contains(env.RELEASE_TAG, '-RC') }} \ --prerelease=${{ contains(env.RELEASE_TAG, '-RC') }} \ --verify-tag ${{ env.RELEASE_TAG }} \ - scala3-${{ env.RELEASE_TAG }}*.zip \ - scala3-${{ env.RELEASE_TAG }}*.tar.gz \ - scala3-${{ env.RELEASE_TAG }}*.sha256 \ - scala3-${{ env.RELEASE_TAG }}.msi + # TODO: dist packaging for 3.8.0 stable release + # scala3-${{ env.RELEASE_TAG }}*.zip \ + # scala3-${{ env.RELEASE_TAG }}*.tar.gz \ + # scala3-${{ env.RELEASE_TAG }}*.sha256 \ + # scala3-${{ env.RELEASE_TAG }}.msi - name: Publish Release - run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaUpload" + run: ./project/scripts/sbtPublish ";project scala3-bootstrapped-new ;publishSigned ;sonaUpload" build-msi-package: uses: ./.github/workflows/build-msi.yml diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index b81166aec84e..0f3c9449c478 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -32,6 +32,7 @@ jobs: publish-winget: uses: ./.github/workflows/publish-winget.yml + if: false # TODO: Requires setting up initial WinGet package with: version: ${{ inputs.version }} secrets: diff --git a/project/Build.scala b/project/Build.scala index ace72ae64529..317008961f13 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -186,6 +186,7 @@ object Build { */ val stdlibBootstrappedVersion = "2.13.16" + val homepageUrl = "https://scala-lang.org/" val dottyOrganization = "org.scala-lang" val dottyGithubUrl = "https://github.com/scala/scala3" val dottyGithubRawUserContentUrl = "https://raw.githubusercontent.com/scala/scala3" @@ -3784,7 +3785,7 @@ object Build { id.withExtraAttributes(id.extraAttributes + line) }, Test / publishArtifact := false, - homepage := Some(url(dottyGithubUrl)), + homepage := Some(url(homepageUrl)), licenses += (("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))), scmInfo := Some(ScmInfo(url(dottyGithubUrl), "scm:git:git@github.com:scala/scala3.git")), developers := List( @@ -3792,7 +3793,7 @@ object Build { id = "scala", name = "The Scala Team", email = "security@scala-lang.org", - url = url("https://scala-lang.org") + url = url(homepageUrl) ) ), )