Skip to content

Commit 5058a7b

Browse files
hamzaremmalWojciechMazur
authored andcommitted
disable dist projects
[Cherry-picked 53dac46]
1 parent 00a7e52 commit 5058a7b

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ jobs:
128128
run: sbt ";scala3-bootstrapped/compile"
129129
shell: cmd
130130

131-
- name: build binary
132-
run: sbt "dist-win-x86_64/Universal/stage" & bash -version
133-
shell: cmd
131+
#- name: build binary
132+
# run: sbt "dist-win-x86_64/Universal/stage" & bash -version
133+
# shell: cmd
134134

135135
- name: cygwin tests
136136
run: '"C:\Program Files\cygwin64\bin\bash" ./project/scripts/winCmdTests'

.github/workflows/scaladoc.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ jobs:
4141
- name: Compile and test scala3doc-js
4242
run: ./project/scripts/sbt scaladoc-js-main/test
4343

44-
- name: Compile and test
45-
run: |
46-
./project/scripts/sbt scaladoc/test
47-
./project/scripts/sbt dist/Universal/stage
48-
./project/scripts/cmdScaladocTests
44+
#- name: Compile and test
45+
# run: |
46+
# ./project/scripts/sbt scaladoc/test
47+
# ./project/scripts/sbt dist/Universal/stage
48+
# ./project/scripts/cmdScaladocTests
4949

5050
- name: Locally publish self
5151
run: ./project/scripts/sbt scaladoc/publishLocal

.github/workflows/test-launchers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Test CLI Launchers on all the platforms
22
on:
3-
pull_request:
3+
#pull_request:
44
workflow_dispatch:
55

66
env:

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ val `scaladoc-testcases` = Build.`scaladoc-testcases`
4141
val `scaladoc-js-common` = Build.`scaladoc-js-common`
4242
val `scaladoc-js-main` = Build.`scaladoc-js-main`
4343
val `scaladoc-js-contributors` = Build.`scaladoc-js-contributors`
44-
val dist = Build.dist
45-
val `dist-mac-x86_64` = Build.`dist-mac-x86_64`
46-
val `dist-mac-aarch64` = Build.`dist-mac-aarch64`
47-
val `dist-win-x86_64` = Build.`dist-win-x86_64`
48-
val `dist-linux-x86_64` = Build.`dist-linux-x86_64`
49-
val `dist-linux-aarch64` = Build.`dist-linux-aarch64`
44+
//val dist = Build.dist
45+
//val `dist-mac-x86_64` = Build.`dist-mac-x86_64`
46+
//val `dist-mac-aarch64` = Build.`dist-mac-aarch64`
47+
//val `dist-win-x86_64` = Build.`dist-win-x86_64`
48+
//val `dist-linux-x86_64` = Build.`dist-linux-x86_64`
49+
//val `dist-linux-aarch64` = Build.`dist-linux-aarch64`
5050
val `community-build` = Build.`community-build`
5151
val `scala3-presentation-compiler` = Build.`scala3-presentation-compiler`
5252
val `scala3-presentation-compiler-testcases` = Build.`scala3-presentation-compiler-testcases`

project/Build.scala

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3854,7 +3854,7 @@ object Build {
38543854
),
38553855
)
38563856

3857-
lazy val commonDistSettings = Seq(
3857+
/*lazy val commonDistSettings = Seq(
38583858
publishArtifact := false,
38593859
republishRepo := target.value / "republish",
38603860
Universal / packageName := packageName.value,
@@ -3879,39 +3879,39 @@ object Build {
38793879
republishCommandLibs += ("scala" -> List("scala3-interfaces", "scala3-compiler", "scala3-library", "tasty-core")),
38803880
republishCommandLibs += ("with_compiler" -> List("scala3-staging", "scala3-tasty-inspector", "^!scala3-interfaces", "^!scala3-compiler", "^!scala3-library", "^!tasty-core")),
38813881
republishCommandLibs += ("scaladoc" -> List("scala3-interfaces", "scala3-compiler", "scala3-library", "tasty-core", "scala3-tasty-inspector", "scaladoc")),
3882-
)
3882+
)*/
38833883

3884-
lazy val dist = project.asDist(Bootstrapped)
3884+
/*lazy val dist = project.asDist(Bootstrapped)
38853885
.settings(packageName := "scala3-" + dottyVersion)
38863886
.settings(
38873887
republishLibexecDir := baseDirectory.value / "libexec",
38883888
republishCoursier +=
38893889
("coursier.jar" -> s"https://github.com/coursier/coursier/releases/download/v$coursierJarVersion/coursier.jar"),
38903890
republishLaunchers +=
38913891
("scala-cli.jar" -> s"https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli.jar"),
3892-
)
3892+
)*/
38933893

3894-
lazy val `dist-mac-x86_64` = project.in(file("dist/mac-x86_64")).asDist(Bootstrapped)
3894+
/*lazy val `dist-mac-x86_64` = project.in(file("dist/mac-x86_64")).asDist(Bootstrapped)
38953895
.settings(packageName := (dist / packageName).value + "-x86_64-apple-darwin")
38963896
.settings(
38973897
republishLibexecDir := (dist / republishLibexecDir).value,
38983898
republishLibexecOverrides += (dist / baseDirectory).value / "libexec-native-overrides",
38993899
republishFetchCoursier := (dist / republishFetchCoursier).value,
39003900
republishLaunchers +=
39013901
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-x86_64-apple-darwin.gz")
3902-
)
3902+
)*/
39033903

3904-
lazy val `dist-mac-aarch64` = project.in(file("dist/mac-aarch64")).asDist(Bootstrapped)
3904+
/*lazy val `dist-mac-aarch64` = project.in(file("dist/mac-aarch64")).asDist(Bootstrapped)
39053905
.settings(packageName := (dist / packageName).value + "-aarch64-apple-darwin")
39063906
.settings(
39073907
republishLibexecDir := (dist / republishLibexecDir).value,
39083908
republishLibexecOverrides += (dist / baseDirectory).value / "libexec-native-overrides",
39093909
republishFetchCoursier := (dist / republishFetchCoursier).value,
39103910
republishLaunchers +=
39113911
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-aarch64-apple-darwin.gz")
3912-
)
3912+
)*/
39133913

3914-
lazy val `dist-win-x86_64` = project.in(file("dist/win-x86_64")).asDist(Bootstrapped)
3914+
/*lazy val `dist-win-x86_64` = project.in(file("dist/win-x86_64")).asDist(Bootstrapped)
39153915
.enablePlugins(WindowsPlugin) // TO GENERATE THE `.msi` installer
39163916
.settings(packageName := (dist / packageName).value + "-x86_64-pc-win32")
39173917
.settings(
@@ -3936,27 +3936,27 @@ object Build {
39363936
wixProductId := "*", // Unique ID for each generated MSI; will change for each generated msi
39373937
wixProductUpgradeId := "3E5A1A82-CA67-4353-94FE-5BDD400AF66B", // Unique ID to identify the package; used to manage the upgrades
39383938
wixProductLicense := Some(dist.base / "LICENSE.rtf") // Link to the LICENSE to show during the installation (keep in sync with ../LICENSE)
3939-
)
3939+
)*/
39403940

3941-
lazy val `dist-linux-x86_64` = project.in(file("dist/linux-x86_64")).asDist(Bootstrapped)
3941+
/*lazy val `dist-linux-x86_64` = project.in(file("dist/linux-x86_64")).asDist(Bootstrapped)
39423942
.settings(packageName := (dist / packageName).value + "-x86_64-pc-linux")
39433943
.settings(
39443944
republishLibexecDir := (dist / republishLibexecDir).value,
39453945
republishLibexecOverrides += (dist / baseDirectory).value / "libexec-native-overrides",
39463946
republishFetchCoursier := (dist / republishFetchCoursier).value,
39473947
republishLaunchers +=
39483948
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-x86_64-pc-linux.gz")
3949-
)
3949+
)*/
39503950

3951-
lazy val `dist-linux-aarch64` = project.in(file("dist/linux-aarch64")).asDist(Bootstrapped)
3951+
/*lazy val `dist-linux-aarch64` = project.in(file("dist/linux-aarch64")).asDist(Bootstrapped)
39523952
.settings(packageName := (dist / packageName).value + "-aarch64-pc-linux")
39533953
.settings(
39543954
republishLibexecDir := (dist / republishLibexecDir).value,
39553955
republishLibexecOverrides += (dist / baseDirectory).value / "libexec-native-overrides",
39563956
republishFetchCoursier := (dist / republishFetchCoursier).value,
39573957
republishLaunchers +=
39583958
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-aarch64-pc-linux.gz")
3959-
)
3959+
)*/
39603960

39613961
private def customMimaReportBinaryIssues(issueFilterLocation: String) = mimaReportBinaryIssues := {
39623962
mimaReportBinaryIssues.result.value match {
@@ -4062,7 +4062,7 @@ object Build {
40624062
settings(commonBenchmarkSettings).
40634063
enablePlugins(JmhPlugin)*/
40644064

4065-
def asDist(implicit mode: Mode): Project = project.
4065+
/*def asDist(implicit mode: Mode): Project = project.
40664066
enablePlugins(UniversalPlugin, RepublishPlugin).
40674067
withCommonSettings.
40684068
settings(commonDistSettings).
@@ -4078,7 +4078,7 @@ object Build {
40784078
).
40794079
bootstrappedSettings(
40804080
target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
4081-
)
4081+
)*/
40824082

40834083
def withCommonSettings(implicit mode: Mode): Project = project.settings(mode match {
40844084
case NonBootstrapped => commonNonBootstrappedSettings

0 commit comments

Comments
 (0)