Skip to content

Commit 7ceb5a1

Browse files
committed
fix(gha): configure zizmor as separate workflow, use explicit persist-credentials
1 parent b95d53d commit 7ceb5a1

3 files changed

Lines changed: 27 additions & 18 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,6 @@ jobs:
4343
- name: Publish to local maven repo
4444
run: make install
4545

46-
zizmor:
47-
name: zizmor
48-
runs-on: ubuntu-latest
49-
permissions:
50-
security-events: write
51-
steps:
52-
- name: Checkout
53-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
54-
with:
55-
persist-credentials: false
56-
57-
- name: Run zizmor
58-
uses: zizmorcore/zizmor-action@53290badfa369cb0bf7ad16342cb62c2fa47ac7b # v0.8.0
59-
6046
cd:
6147
name: CD
6248
runs-on: ubuntu-latest
@@ -70,15 +56,15 @@ jobs:
7056
with:
7157
# we need to fetch all existing git tags
7258
fetch-depth: 0
73-
persist-credentials: false
59+
# Required to push release tags from scripts/publish.sh.
60+
persist-credentials: true
7461

7562
- name: Create git tags and publish to Maven Central
7663
env:
7764
GPG_SIGNING_KEY: "${{ secrets.GPG_SIGNING_KEY }}"
7865
GPG_SIGNING_PASSWORD: "${{ secrets.GPG_SIGNING_PASSWORD }}"
7966
ORG_GRADLE_PROJECT_mavenCentralUsername: "${{ secrets.MAVEN_CENTRAL_USERNAME }}"
8067
ORG_GRADLE_PROJECT_mavenCentralPassword: "${{ secrets.MAVEN_CENTRAL_PASSWORD }}"
81-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8268
run: |
8369
git config --global user.name "SDK Releaser Bot"
8470
git config --global user.email "noreply@stackit.de"

‎.github/workflows/zizmor.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: zizmor
2+
3+
permissions: {}
4+
5+
on:
6+
pull_request:
7+
workflow_dispatch:
8+
push:
9+
branches: ["main"]
10+
11+
jobs:
12+
zizmor:
13+
name: zizmor
14+
runs-on: ubuntu-latest
15+
permissions:
16+
security-events: write
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
20+
with:
21+
persist-credentials: false
22+
23+
- name: Run zizmor
24+
uses: zizmorcore/zizmor-action@53290badfa369cb0bf7ad16342cb62c2fa47ac7b # v0.8.0

‎scripts/publish.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ for file in $(find . -print | sed 's|^./||' | grep -E "(^services/[^/]+/VERSION$
2727
# Tag doesn't exist. Create a tag and push it.
2828
echo "Tag '$expected_tag' does not exist."
2929
git tag -a $expected_tag -m "Release $version"
30-
auth_header=$(printf 'x-access-token:%s' "$GITHUB_TOKEN" | base64 -w0)
31-
git -c http.extraheader="AUTHORIZATION: basic $auth_header" push origin tag "$expected_tag"
30+
git push origin tag "$expected_tag"
3231

3332
./gradlew "${gradle_subproject}:publishToMavenCentral"
3433
fi

0 commit comments

Comments
 (0)