Skip to content

Commit fcee7a6

Browse files
committed
turn back on github actions publishing and update example and bootstrap script download URLs
1 parent 5afe11a commit fcee7a6

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

.github/workflows/publish-artifacts.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
include:
2929
- os: ubuntu-latest
3030
coursierarchive: "/tmp"
31-
publishartifacts: core.constants.publishArtifacts
31+
publishartifacts: __.publishArtifacts
3232
uploadgithub: true
3333

3434
- os: ubuntu-24.04-arm
@@ -38,18 +38,18 @@ jobs:
3838

3939
- os: macos-13
4040
coursierarchive: "/tmp"
41-
publishartifacts: dist.publishArtifacts
41+
publishartifacts: dist.native.publishArtifacts
4242
uploadgithub: false
4343

44-
# - os: macos-latest
45-
# coursierarchive: "/tmp"
46-
# publishartifacts: dist.native.publishArtifacts
47-
# uploadgithub: false
48-
#
49-
# - os: windows-latest
50-
# coursierarchive: C:/coursier-arc
51-
# publishartifacts: dist.native.publishArtifacts
52-
# uploadgithub: false
44+
- os: macos-latest
45+
coursierarchive: "/tmp"
46+
publishartifacts: dist.native.publishArtifacts
47+
uploadgithub: false
48+
49+
- os: windows-latest
50+
coursierarchive: C:/coursier-arc
51+
publishartifacts: dist.native.publishArtifacts
52+
uploadgithub: false
5353

5454
# No windows-arm support becaues Graal native image doesn't support it
5555
# https://github.com/oracle/graal/issues/9215

dist/package.mill

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ trait DistModule extends Module {
6363
}
6464

6565
def artifactName: T[String]
66-
def artifact = Task{ Artifact(Settings.pomOrg, artifactName(), build.millVersion()) }
67-
def pomSettings = Task{ MillPublishJavaModule.commonPomSettings(artifactName()) }
66+
def artifact = Task { Artifact(Settings.pomOrg, artifactName(), build.millVersion()) }
67+
def pomSettings = Task { MillPublishJavaModule.commonPomSettings(artifactName()) }
6868

69-
def artifactFileNamePrefix = Task{ s"${artifactName()}-${build.millVersion()}" }
69+
def artifactFileNamePrefix = Task { s"${artifactName()}-${build.millVersion()}" }
7070
def pom: T[PathRef] = Task {
7171
val pom = Pom(
7272
artifact = artifact(),

libs/init/package.mill

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ object `package` extends MillPublishScalaModule {
1818
def exampleList: T[PathRef] = Task {
1919
val data: Seq[(os.SubPath, String)] =
2020
build.dist.examplePathsWithArtifactName().map { case (pathRef, str) =>
21-
val downloadUrl = s"${build.millDownloadUrl()}/$str.zip"
21+
val downloadUrl =
22+
s"${build.millDownloadUrl()}/mill-dist-${build.dist.artifactFileNamePrefix()}-$str.zip"
2223
val subPath = pathRef.path.subRelativeTo(Task.workspace / "example")
2324
(subPath, downloadUrl)
2425
}

libs/scalalib/src/mill/scalalib/SonatypeCentralPublisher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class SonatypeCentralPublisher(
4141
artifacts: (Seq[(os.Path, String)], Artifact)*
4242
): Unit = {
4343
val mappings = getArtifactMappings(isSigned = true, gpgArgs, workspace, env, artifacts)
44-
log.info(s"mappings ${pprint.apply(mappings.map{case (a, kvs) => (a, kvs.map(_._1))})}")
44+
log.info(s"mappings ${pprint.apply(mappings.map { case (a, kvs) => (a, kvs.map(_._1)) })}")
4545
val (_, releases) = mappings.partition(_._1.isSnapshot)
4646

4747
val releaseGroups = releases.groupBy(_._1.group)

website/docs/modules/ROOT/pages/cli/installation-ide.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ bootstrap script, included. You can also download the boostrap script manually:
2020
.Mac/Linux
2121
[source,console,subs="verbatim,attributes"]
2222
----
23-
> curl -L {mill-download-url}/mill -o mill
23+
> curl -L {mill-download-url}/mill-dist-{mill-version}-mill.sh -o mill
2424
> chmod +x mill
2525
> echo {mill-version} > .mill-version
2626
----
2727
2828
.Windows
2929
[source,console,subs="verbatim,attributes"]
3030
----
31-
> curl -L {mill-download-url}/mill.bat -o mill.bat
31+
> curl -L {mill-download-url}/mill-dist-{mill-version}-mill.bat -o mill.bat
3232
> echo {mill-version}> .mill-version
3333
----
3434

0 commit comments

Comments
 (0)