Skip to content

Commit 53dac46

Browse files
hamzaremmalhamzaremmal
committed
disable dist projects
1 parent 8d9f9b0 commit 53dac46

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
@@ -3794,7 +3794,7 @@ object Build {
37943794
),
37953795
)
37963796

3797-
lazy val commonDistSettings = Seq(
3797+
/*lazy val commonDistSettings = Seq(
37983798
publishArtifact := false,
37993799
republishRepo := target.value / "republish",
38003800
Universal / packageName := packageName.value,
@@ -3819,39 +3819,39 @@ object Build {
38193819
republishCommandLibs += ("scala" -> List("scala3-interfaces", "scala3-compiler", "scala3-library", "tasty-core")),
38203820
republishCommandLibs += ("with_compiler" -> List("scala3-staging", "scala3-tasty-inspector", "^!scala3-interfaces", "^!scala3-compiler", "^!scala3-library", "^!tasty-core")),
38213821
republishCommandLibs += ("scaladoc" -> List("scala3-interfaces", "scala3-compiler", "scala3-library", "tasty-core", "scala3-tasty-inspector", "scaladoc")),
3822-
)
3822+
)*/
38233823

3824-
lazy val dist = project.asDist(Bootstrapped)
3824+
/*lazy val dist = project.asDist(Bootstrapped)
38253825
.settings(packageName := "scala3-" + dottyVersion)
38263826
.settings(
38273827
republishLibexecDir := baseDirectory.value / "libexec",
38283828
republishCoursier +=
38293829
("coursier.jar" -> s"https://github.com/coursier/coursier/releases/download/v$coursierJarVersion/coursier.jar"),
38303830
republishLaunchers +=
38313831
("scala-cli.jar" -> s"https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli.jar"),
3832-
)
3832+
)*/
38333833

3834-
lazy val `dist-mac-x86_64` = project.in(file("dist/mac-x86_64")).asDist(Bootstrapped)
3834+
/*lazy val `dist-mac-x86_64` = project.in(file("dist/mac-x86_64")).asDist(Bootstrapped)
38353835
.settings(packageName := (dist / packageName).value + "-x86_64-apple-darwin")
38363836
.settings(
38373837
republishLibexecDir := (dist / republishLibexecDir).value,
38383838
republishLibexecOverrides += (dist / baseDirectory).value / "libexec-native-overrides",
38393839
republishFetchCoursier := (dist / republishFetchCoursier).value,
38403840
republishLaunchers +=
38413841
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-x86_64-apple-darwin.gz")
3842-
)
3842+
)*/
38433843

3844-
lazy val `dist-mac-aarch64` = project.in(file("dist/mac-aarch64")).asDist(Bootstrapped)
3844+
/*lazy val `dist-mac-aarch64` = project.in(file("dist/mac-aarch64")).asDist(Bootstrapped)
38453845
.settings(packageName := (dist / packageName).value + "-aarch64-apple-darwin")
38463846
.settings(
38473847
republishLibexecDir := (dist / republishLibexecDir).value,
38483848
republishLibexecOverrides += (dist / baseDirectory).value / "libexec-native-overrides",
38493849
republishFetchCoursier := (dist / republishFetchCoursier).value,
38503850
republishLaunchers +=
38513851
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-aarch64-apple-darwin.gz")
3852-
)
3852+
)*/
38533853

3854-
lazy val `dist-win-x86_64` = project.in(file("dist/win-x86_64")).asDist(Bootstrapped)
3854+
/*lazy val `dist-win-x86_64` = project.in(file("dist/win-x86_64")).asDist(Bootstrapped)
38553855
.enablePlugins(WindowsPlugin) // TO GENERATE THE `.msi` installer
38563856
.settings(packageName := (dist / packageName).value + "-x86_64-pc-win32")
38573857
.settings(
@@ -3876,27 +3876,27 @@ object Build {
38763876
wixProductId := "*", // Unique ID for each generated MSI; will change for each generated msi
38773877
wixProductUpgradeId := "3E5A1A82-CA67-4353-94FE-5BDD400AF66B", // Unique ID to identify the package; used to manage the upgrades
38783878
wixProductLicense := Some(dist.base / "LICENSE.rtf") // Link to the LICENSE to show during the installation (keep in sync with ../LICENSE)
3879-
)
3879+
)*/
38803880

3881-
lazy val `dist-linux-x86_64` = project.in(file("dist/linux-x86_64")).asDist(Bootstrapped)
3881+
/*lazy val `dist-linux-x86_64` = project.in(file("dist/linux-x86_64")).asDist(Bootstrapped)
38823882
.settings(packageName := (dist / packageName).value + "-x86_64-pc-linux")
38833883
.settings(
38843884
republishLibexecDir := (dist / republishLibexecDir).value,
38853885
republishLibexecOverrides += (dist / baseDirectory).value / "libexec-native-overrides",
38863886
republishFetchCoursier := (dist / republishFetchCoursier).value,
38873887
republishLaunchers +=
38883888
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-x86_64-pc-linux.gz")
3889-
)
3889+
)*/
38903890

3891-
lazy val `dist-linux-aarch64` = project.in(file("dist/linux-aarch64")).asDist(Bootstrapped)
3891+
/*lazy val `dist-linux-aarch64` = project.in(file("dist/linux-aarch64")).asDist(Bootstrapped)
38923892
.settings(packageName := (dist / packageName).value + "-aarch64-pc-linux")
38933893
.settings(
38943894
republishLibexecDir := (dist / republishLibexecDir).value,
38953895
republishLibexecOverrides += (dist / baseDirectory).value / "libexec-native-overrides",
38963896
republishFetchCoursier := (dist / republishFetchCoursier).value,
38973897
republishLaunchers +=
38983898
("scala-cli" -> s"gz+https://github.com/VirtusLab/scala-cli/releases/download/v$scalaCliLauncherVersion/scala-cli-aarch64-pc-linux.gz")
3899-
)
3899+
)*/
39003900

39013901
private def customMimaReportBinaryIssues(issueFilterLocation: String) = mimaReportBinaryIssues := {
39023902
mimaReportBinaryIssues.result.value match {
@@ -4002,7 +4002,7 @@ object Build {
40024002
settings(commonBenchmarkSettings).
40034003
enablePlugins(JmhPlugin)*/
40044004

4005-
def asDist(implicit mode: Mode): Project = project.
4005+
/*def asDist(implicit mode: Mode): Project = project.
40064006
enablePlugins(UniversalPlugin, RepublishPlugin).
40074007
withCommonSettings.
40084008
settings(commonDistSettings).
@@ -4018,7 +4018,7 @@ object Build {
40184018
).
40194019
bootstrappedSettings(
40204020
target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
4021-
)
4021+
)*/
40224022

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

0 commit comments

Comments
 (0)