Skip to content

Commit e06a422

Browse files
authored
chore(ci): zizmor fixes, pare down surface (#781)
1 parent 360e4ba commit e06a422

File tree

4 files changed

+56
-76
lines changed

4 files changed

+56
-76
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ on:
66
- master
77
pull_request:
88

9+
permissions: {}
10+
911
jobs:
1012
lint:
1113
runs-on: ubuntu-latest
1214
steps:
13-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
with:
17+
persist-credentials: false
18+
1419
- name: Format
1520
run: cargo fmt && git diff --exit-code
21+
1622
- name: Lint
1723
run: |
1824
rustup update
@@ -25,7 +31,9 @@ jobs:
2531
platform: ["ubuntu-latest", "macos-latest"]
2632
runs-on: ${{ matrix.platform }}
2733
steps:
28-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
with:
36+
persist-credentials: false
2937

3038
- name: deps
3139
if: matrix.platform == 'ubuntu-latest'

.github/workflows/publish.yml

Lines changed: 6 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5,88 +5,21 @@ on:
55
types:
66
- published
77

8+
permissions: {}
9+
810
jobs:
911
crate:
1012
runs-on: ubuntu-latest
1113
steps:
12-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
with:
16+
persist-credentials: false
1317

1418
- name: deps
1519
run: |
1620
sudo apt install -y libxcb-shape0-dev libxcb-xfixes0-dev
1721
18-
- name: login
19-
run: echo ${{ secrets.CRATES_IO_TOKEN }} | cargo login
20-
2122
- name: publish
2223
run: cargo publish
23-
24-
package-bin-linux:
25-
runs-on: ubuntu-latest
26-
steps:
27-
- uses: actions/checkout@v4
28-
29-
- name: deps
30-
run: |
31-
sudo apt install -y libxcb-shape0-dev libxcb-xfixes0-dev
32-
33-
- name: build
34-
run: cargo build --release
35-
36-
- name: tarball
37-
run: |
38-
cd ./target/release
39-
tar czvf kbs2-linux-${{ github.event.release.tag_name }}.tar.gz ./kbs2 ../../LICENSE ../../README.md ../../contrib/
40-
shasum -a 256 kbs2-linux-${{ github.event.release.tag_name }}.tar.gz > kbs2-linux-${{ github.event.release.tag_name }}.sha256
41-
42-
- name: attach tarball to release
43-
uses: actions/upload-release-asset@v1
44-
env:
45-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46-
with:
47-
upload_url: ${{ github.event.release.upload_url }}
48-
asset_path: ./target/release/kbs2-linux-${{ github.event.release.tag_name }}.tar.gz
49-
asset_name: kbs2-linux-${{ github.event.release.tag_name }}.tar.gz
50-
asset_content_type: application/gzip
51-
52-
- name: attach checksum to release
53-
uses: actions/upload-release-asset@v1
54-
env:
55-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56-
with:
57-
upload_url: ${{ github.event.release.upload_url }}
58-
asset_path: ./target/release/kbs2-linux-${{ github.event.release.tag_name }}.sha256
59-
asset_name: kbs2-linux-${{ github.event.release.tag_name }}.sha256
60-
asset_content_type: text/plain
61-
62-
package-deb:
63-
runs-on: ubuntu-latest
64-
steps:
65-
- uses: actions/checkout@v4
66-
67-
- name: deps
68-
run: |
69-
sudo apt install -y libxcb-shape0-dev libxcb-xfixes0-dev
70-
cargo install cargo-deb
71-
72-
- name: package
73-
run: cargo deb
74-
75-
- name: find deb
76-
id: find_deb
77-
run: |
78-
deb_file=$(find ./target/debian/ -maxdepth 1 -type f -name '*.deb')
79-
echo "::set-output name=deb_file::${deb_file}"
80-
81-
deb_name=$(basename "${deb_file}")
82-
echo "::set-output name=deb_name::${deb_name}"
83-
84-
- name: attach to release
85-
uses: actions/upload-release-asset@v1
8624
env:
87-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
88-
with:
89-
upload_url: ${{ github.event.release.upload_url }}
90-
asset_path: ${{ steps.find_deb.outputs.deb_file }}
91-
asset_name: ${{ steps.find_deb.outputs.deb_name }}
92-
asset_content_type: application/vnd.debian.binary-package
25+
CARGO_REGISTRY_TOKEN: "${{ secrets.CRATES_IO_TOKEN }}"

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ on:
55

66
name: release
77

8+
permissions: {}
9+
810
jobs:
911
release:
1012
runs-on: ubuntu-latest
1113
steps:
1214
- name: create release
1315
id: create_release
14-
uses: softprops/action-gh-release@v2
16+
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
1517
env:
1618
# NOTE(ww): GitHub actions cannot trigger other GitHub actions by default,
1719
# but we need that behavior to trigger the 'publish' workflow.

.github/workflows/zizmor.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: GitHub Actions Security Analysis with zizmor 🌈
2+
3+
on:
4+
push:
5+
branches: ["main"]
6+
pull_request:
7+
branches: ["**"]
8+
9+
permissions: {}
10+
11+
jobs:
12+
zizmor:
13+
name: zizmor latest via PyPI
14+
runs-on: ubuntu-latest
15+
permissions:
16+
security-events: write
17+
contents: read # only needed for private repos
18+
actions: read # only needed for private repos
19+
steps:
20+
- name: Checkout repository
21+
uses: actions/checkout@v4
22+
with:
23+
persist-credentials: false
24+
25+
- name: Install the latest version of uv
26+
uses: astral-sh/setup-uv@c7f87aa956e4c323abf06d5dec078e358f6b4d04 # v6.0.0
27+
28+
- name: Run zizmor 🌈
29+
run: uvx zizmor --format=sarif . > results.sarif
30+
env:
31+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32+
33+
- name: Upload SARIF file
34+
uses: github/codeql-action/upload-sarif@v3
35+
with:
36+
sarif_file: results.sarif
37+
category: zizmor

0 commit comments

Comments
 (0)