Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/actions/zipx-sbt-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ inputs:
description: Fixed cache epoch; when non-empty skips git-tag resolve and keys the cache with this value
required: "false"
default: ""
coursier:
description: When true, install cs via coursier/setup-action so the job can launch zipx-cli
required: "false"
default: "false"
runs:
using: composite
steps:
Expand All @@ -35,9 +39,14 @@ runs:
with:
distribution: temurin
java-version: ${{ inputs.java-version }}
- uses: sbt/setup-sbt@8feba82adc7f01ddcf8165b86f778bdb5b82cebc # v1.5.7
- uses: sbt/setup-sbt@c7d2d6258b4bd0d3ec5129e6b3453199d3c79729 # v1.5.8
with:
disk-cache: ${{ inputs.sbt-disk-cache }}
- name: Setup Coursier
if: inputs.coursier == 'true'
uses: coursier/setup-action@9b7939bf01fd1185ce2babe16135168361bf2c62 # v3.0.2
with:
apps: cs
- name: Setup Node
if: inputs.node-version != ''
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/zipx-version-updates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,17 @@ jobs:
cache-key-suffix: version-updates
node-version: ""
sbt-disk-cache: "false"
local-cache: "false"
local-cache: "true"
coursier: "true"
- name: Apply catalog updates
run: |
sbt "zipxDepUpdate yes"
sbt "zipxActionUpdate yes"
set -euo pipefail
. project/zipx-ci.env
if [ -z "${ZIPX_CLI_VERSION:-}" ]; then
echo "zipx: ZIPX_CLI_VERSION is unset. A release writes it to project/zipx-ci.env; dogfood sets it from zipxVersionUpdatesPreSteps."
exit 1
fi
cs launch --ttl Inf "rocks.earlyeffect:zipx-cli_3:$ZIPX_CLI_VERSION" -- catalog update --yes --verify-load
sbt "zipxPinUpdate yes"
sbt zipxCatalogGenerate

Expand All @@ -61,7 +67,7 @@ jobs:
git push -u origin HEAD
gh label create clean --force --description "zipx: Verify runs cleanFull" || true
cat > /tmp/zipx-pr-body.md <<EOF
Applied zipxDepUpdate, zipxActionUpdate, and zipxPinUpdate.
Applied zipx-cli catalog update and zipxPinUpdate.

## Repo-root workflow YAML is not in this PR

Expand Down
2 changes: 1 addition & 1 deletion project/ZipxVersions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import zipx.*
* module already pulls them (specular-core / specular-site via the docs theme).
*/
object MyVersions extends ZipxVersions:
val sbt: SbtVersion = SbtVersion("2.0.6")
val sbt: SbtVersion = SbtVersion("2.0.7")
val scala: ScalaVersion = ScalaVersion("3.8.4")

val zio = Lib("dev.zio", "zio", "2.1.26")
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Generated by zipx. Do not edit. Run 'sbt zipxWorkflowGenerate' to regenerate.
sbt.version=2.0.6
sbt.version=2.0.7
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Generated by zipx. Do not edit. Run 'sbt zipxWorkflowGenerate' to regenerate.
addSbtPlugin("rocks.earlyeffect" % "sbt-zipx" % "0.7.3")
addSbtPlugin("rocks.earlyeffect" % "sbt-zipx" % "0.8.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.12")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.2")
Expand Down
1 change: 1 addition & 0 deletions project/zipx-ci.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Generated by zipx. Do not edit. Run 'sbt zipxWorkflowGenerate' to regenerate.
ZIPX_JAVA_VERSION=25
ZIPX_RUNNER_OS=ubuntu-latest
ZIPX_CLI_VERSION=0.8.1