Skip to content

Commit 14ddab7

Browse files
Backport "[CI] Prepare for 3.8.0-RC1 release" to 3.8.0 (#24428)
Backports #24422 to the 3.8.0-RC1. PR submitted by the release tooling.
2 parents d55102e + 34bbaa3 commit 14ddab7

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

.github/workflows/ci.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,15 @@ jobs:
219219
- name: Check compiler version
220220
shell: bash
221221
run : |
222-
version=$(./project/scripts/sbt "print scala3-compiler-bootstrapped/version" | tail -n1)
222+
version=$(./project/scripts/sbt "print scala3-compiler-bootstrapped-new/version" | tail -n1)
223223
echo "This build version: ${version}"
224224
if [ "${version}" != "${{ env.RELEASE_TAG }}" ]; then
225225
echo "Compiler version for this build '${version}', does not match tag: ${{ env.RELEASE_TAG }}"
226226
exit 1
227227
fi
228228
229229
- name: Prepare the SDKs
230+
if: false # TODO: Requires changes to dist targets, to be done before stable release
230231
shell: bash
231232
run : |
232233
prepareSDK() {
@@ -253,11 +254,13 @@ jobs:
253254
prepareSDK "-x86_64-pc-win32" "dist-win-x86_64" "./dist/win-x86_64/"
254255
255256
- name: Download MSI package
257+
if: false # TODO: Requires changes to dist targets, to be done before stable release
256258
uses: actions/download-artifact@v6
257259
with:
258260
name: scala.msi
259261
path: .
260262
- name: Prepare MSI package
263+
if: false # TODO: Requires changes to dist targets, to be done before stable release
261264
shell: bash
262265
run: |
263266
msiInstaller="scala3-${{ env.RELEASE_TAG }}.msi"
@@ -285,13 +288,14 @@ jobs:
285288
--latest=${{ !contains(env.RELEASE_TAG, '-RC') }} \
286289
--prerelease=${{ contains(env.RELEASE_TAG, '-RC') }} \
287290
--verify-tag ${{ env.RELEASE_TAG }} \
288-
scala3-${{ env.RELEASE_TAG }}*.zip \
289-
scala3-${{ env.RELEASE_TAG }}*.tar.gz \
290-
scala3-${{ env.RELEASE_TAG }}*.sha256 \
291-
scala3-${{ env.RELEASE_TAG }}.msi
291+
# TODO: dist packaging for 3.8.0 stable release
292+
# scala3-${{ env.RELEASE_TAG }}*.zip \
293+
# scala3-${{ env.RELEASE_TAG }}*.tar.gz \
294+
# scala3-${{ env.RELEASE_TAG }}*.sha256 \
295+
# scala3-${{ env.RELEASE_TAG }}.msi
292296
293297
- name: Publish Release
294-
run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaUpload"
298+
run: ./project/scripts/sbtPublish ";project scala3-bootstrapped-new ;publishSigned ;sonaUpload"
295299

296300
build-msi-package:
297301
uses: ./.github/workflows/build-msi.yml

.github/workflows/releases.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232

3333
publish-winget:
3434
uses: ./.github/workflows/publish-winget.yml
35+
if: false # TODO: Requires setting up initial WinGet package
3536
with:
3637
version: ${{ inputs.version }}
3738
secrets:

project/Build.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ object Build {
186186
*/
187187
val stdlibBootstrappedVersion = "2.13.16"
188188

189+
val homepageUrl = "https://scala-lang.org/"
189190
val dottyOrganization = "org.scala-lang"
190191
val dottyGithubUrl = "https://github.com/scala/scala3"
191192
val dottyGithubRawUserContentUrl = "https://raw.githubusercontent.com/scala/scala3"
@@ -3784,15 +3785,15 @@ object Build {
37843785
id.withExtraAttributes(id.extraAttributes + line)
37853786
},
37863787
Test / publishArtifact := false,
3787-
homepage := Some(url(dottyGithubUrl)),
3788+
homepage := Some(url(homepageUrl)),
37883789
licenses += (("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))),
37893790
scmInfo := Some(ScmInfo(url(dottyGithubUrl), "scm:git:git@github.com:scala/scala3.git")),
37903791
developers := List(
37913792
Developer(
37923793
id = "scala",
37933794
name = "The Scala Team",
37943795
email = "security@scala-lang.org",
3795-
url = url("https://scala-lang.org")
3796+
url = url(homepageUrl)
37963797
)
37973798
),
37983799
)

0 commit comments

Comments
 (0)