Skip to content

Commit 3bf58d7

Browse files
zio-scala-steward[bot]zio-scala-steward[bot]
committed
Regenerate GitHub Actions workflow
Executed command: sbt ciGenerateGithubWorkflow
1 parent 7b6061b commit 3bf58d7

3 files changed

Lines changed: 34 additions & 18 deletions

File tree

‎.github/workflows/auto-merge.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,24 @@ jobs:
4747
if: ${{ github.event_name == 'pull_request_target' }}
4848
run: |
4949
set -euo pipefail
50+
protected=$(gh api "repos/$GH_REPO/branches/$BASE" \
51+
--jq '.protection.required_status_checks.contexts | length')
52+
ruleset=$(gh api "repos/$GH_REPO/rules/branches/$BASE" \
53+
--jq '[.[] | select(.type == "required_status_checks")] | length')
54+
if [ $((protected + ruleset)) -gt 0 ]; then
55+
echo "$BASE requires status checks, enabling auto-merge"
56+
gh pr merge --auto --squash "$PR"
57+
exit 0
58+
fi
59+
echo "$BASE has no required status checks, waiting for CI before merging"
5060
while true; do
51-
checks=$(gh pr checks "$PR" --json name,bucket \
52-
--jq '[.[] | select(.name != "auto-merge" and .name != "auto-approve-bot-prs")]' 2>/dev/null || true)
61+
if ! checks=$(gh pr checks "$PR" --json name,bucket \
62+
--jq '[.[] | select(.name != "auto-merge" and .name != "auto-approve-bot-prs")]' 2>&1); then
63+
case "$checks" in
64+
*"no checks reported"*) checks='[]' ;;
65+
*) echo "$checks" >&2; exit 1 ;;
66+
esac
67+
fi
5368
checks=${checks:-[]}
5469
total=$(jq length <<< "$checks")
5570
pending=$(jq '[.[] | select(.bucket == "pending")] | length' <<< "$checks")
@@ -70,6 +85,7 @@ jobs:
7085
GH_TOKEN: ${{ steps.generate-token.outputs.token || secrets.GITHUB_TOKEN }}
7186
GH_REPO: ${{ github.repository }}
7287
PR: ${{ github.event.number }}
88+
BASE: ${{ github.event.pull_request.base.ref }}
7389
- name: Backfill auto-merge for existing bot PRs
7490
if: ${{ github.event_name == 'workflow_dispatch' }}
7591
run: |

‎.github/workflows/ci.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ jobs:
3232
- name: Install libuv
3333
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
3434
- name: Setup Scala
35-
uses: actions/setup-java@v6.0.1
35+
uses: actions/setup-java@v6.1.0
3636
with:
3737
distribution: corretto
3838
java-version: '17'
3939
check-latest: true
4040
- name: Setup SBT
4141
uses: sbt/setup-sbt@v1.5.7
4242
- name: Cache Dependencies
43-
uses: coursier/cache-action@v8.1.1
43+
uses: coursier/cache-action@v8.2.0
4444
- name: Check all code compiles
4545
run: sbt --no-colors +Test/compile
4646
- name: Check artifacts build process
@@ -61,15 +61,15 @@ jobs:
6161
- name: Install libuv
6262
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
6363
- name: Setup Scala
64-
uses: actions/setup-java@v6.0.1
64+
uses: actions/setup-java@v6.1.0
6565
with:
6666
distribution: corretto
6767
java-version: '17'
6868
check-latest: true
6969
- name: Setup SBT
7070
uses: sbt/setup-sbt@v1.5.7
7171
- name: Cache Dependencies
72-
uses: coursier/cache-action@v8.1.1
72+
uses: coursier/cache-action@v8.2.0
7373
- name: Check if the site workflow is up to date
7474
run: sbt --no-colors ciCheckGithubWorkflow
7575
- name: Lint
@@ -97,15 +97,15 @@ jobs:
9797
- name: Install libuv
9898
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
9999
- name: Setup Scala
100-
uses: actions/setup-java@v6.0.1
100+
uses: actions/setup-java@v6.1.0
101101
with:
102102
distribution: corretto
103103
java-version: ${{ matrix.java }}
104104
check-latest: true
105105
- name: Setup SBT
106106
uses: sbt/setup-sbt@v1.5.7
107107
- name: Cache Dependencies
108-
uses: coursier/cache-action@v8.1.1
108+
uses: coursier/cache-action@v8.2.0
109109
- name: Git Checkout
110110
uses: actions/checkout@v7.0.1
111111
with:
@@ -128,15 +128,15 @@ jobs:
128128
- name: Install libuv
129129
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
130130
- name: Setup Scala
131-
uses: actions/setup-java@v6.0.1
131+
uses: actions/setup-java@v6.1.0
132132
with:
133133
distribution: corretto
134134
java-version: '17'
135135
check-latest: true
136136
- name: Setup SBT
137137
uses: sbt/setup-sbt@v1.5.7
138138
- name: Cache Dependencies
139-
uses: coursier/cache-action@v8.1.1
139+
uses: coursier/cache-action@v8.2.0
140140
- name: Generate Readme
141141
run: sbt --no-colors docs/generateReadme
142142
- name: Generate Token
@@ -204,15 +204,15 @@ jobs:
204204
- name: Install libuv
205205
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
206206
- name: Setup Scala
207-
uses: actions/setup-java@v6.0.1
207+
uses: actions/setup-java@v6.1.0
208208
with:
209209
distribution: corretto
210210
java-version: '17'
211211
check-latest: true
212212
- name: Setup SBT
213213
uses: sbt/setup-sbt@v1.5.7
214214
- name: Cache Dependencies
215-
uses: coursier/cache-action@v8.1.1
215+
uses: coursier/cache-action@v8.2.0
216216
- name: Release
217217
run: sbt --no-colors ci-release
218218
env:
@@ -235,19 +235,19 @@ jobs:
235235
- name: Install libuv
236236
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
237237
- name: Setup Scala
238-
uses: actions/setup-java@v6.0.1
238+
uses: actions/setup-java@v6.1.0
239239
with:
240240
distribution: corretto
241241
java-version: '17'
242242
check-latest: true
243243
- name: Setup SBT
244244
uses: sbt/setup-sbt@v1.5.7
245245
- name: Cache Dependencies
246-
uses: coursier/cache-action@v8.1.1
246+
uses: coursier/cache-action@v8.2.0
247247
- name: Setup NodeJs
248-
uses: actions/setup-node@v7.0.0
248+
uses: actions/setup-node@v7.1.0
249249
with:
250-
node-version: 24.12.0
250+
node-version: 24.22.1
251251
registry-url: https://registry.npmjs.org
252252
- name: Publish Docs to NPM Registry
253253
run: sbt --no-colors docs/publishToNpm

‎.github/workflows/regenerate-workflows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ jobs:
4545
fetch-depth: '0'
4646
token: ${{ steps.generate-token.outputs.token || secrets.GITHUB_TOKEN }}
4747
- name: Setup Scala
48-
uses: actions/setup-java@v6.0.1
48+
uses: actions/setup-java@v6.1.0
4949
with:
5050
distribution: corretto
5151
java-version: '17'
5252
check-latest: true
5353
- name: Setup SBT
5454
uses: sbt/setup-sbt@v1.5.7
5555
- name: Cache Dependencies
56-
uses: coursier/cache-action@v8.1.1
56+
uses: coursier/cache-action@v8.2.0
5757
- name: Regenerate GitHub workflow files
5858
run: sbt --no-colors ciGenerateGithubWorkflow
5959
- name: Commit and push the regenerated files if changed

0 commit comments

Comments
 (0)