diff --git a/.github/actions/zipx-sbt-setup/action.yml b/.github/actions/zipx-sbt-setup/action.yml index ec6854b..12c73ca 100644 --- a/.github/actions/zipx-sbt-setup/action.yml +++ b/.github/actions/zipx-sbt-setup/action.yml @@ -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: @@ -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 diff --git a/.github/workflows/zipx-version-updates.yml b/.github/workflows/zipx-version-updates.yml index 7baf0b8..3f67af3 100644 --- a/.github/workflows/zipx-version-updates.yml +++ b/.github/workflows/zipx-version-updates.yml @@ -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 @@ -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 <