Skip to content

Commit 0572270

Browse files
Use zig action to download zig (#846)
* Use zig action to download zig * Don't use cache for zig on publish
1 parent 572bab9 commit 0572270

File tree

3 files changed

+12
-80
lines changed

3 files changed

+12
-80
lines changed

.github/workflows/code-coverage.yml

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -67,44 +67,12 @@ jobs:
6767
run: |-
6868
sudo apt-get install fuse3 ${FUSELIB} -y
6969
70-
- name: Cache Zig
70+
- name: Install Zig
7171
if: runner.os == 'Linux'
72-
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
72+
uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1
7373
with:
74-
path: ~/.local/bin
75-
key: zig-${{ env.zig }}-${{ runner.arch }}-${{ runner.os }}
76-
77-
- name: Install Zig
78-
env:
79-
RUNNER_ARCH: ${{ runner.arch }}
80-
ENV_ZIG: ${{ env.zig }}
81-
run: |
82-
if [[ "${RUNNER_ARCH}" == "X64" ]]; then
83-
ZIG_ARCH="x86_64"
84-
elif [[ "${RUNNER_ARCH}" == "ARM64" ]]; then
85-
ZIG_ARCH="aarch64"
86-
else
87-
echo "Unsupported architecture: ${RUNNER_ARCH}"
88-
exit 1
89-
fi
90-
91-
ZIG_DIR="zig-${ZIG_ARCH}-linux-${ENV_ZIG}"
92-
ZIG_TARBALL="${ZIG_DIR}.tar.xz"
93-
ZIG_DIR_PATH="$HOME/.local/bin/${ZIG_DIR}"
94-
95-
# If cached Zig already exists, add it to PATH and skip download
96-
if [ -d "${ZIG_DIR_PATH}" ]; then
97-
echo "Found cached Zig at ${ZIG_DIR_PATH}"
98-
echo "${ZIG_DIR_PATH}" >> $GITHUB_PATH
99-
exit 0
100-
fi
101-
102-
# Otherwise download and extract Zig, then add to PATH
103-
curl -L https://ziglang.org/download/${ENV_ZIG}/${ZIG_TARBALL} -o zig.tar.xz
104-
mkdir -p $HOME/.local/bin
105-
tar -xf zig.tar.xz -C $HOME/.local/bin
106-
echo "${ZIG_DIR_PATH}" >> $GITHUB_PATH
107-
rm zig.tar.xz
74+
version: ${{ env.zig }}
75+
cache-key: zig-${{ env.zig }}-${{ runner.arch }}-${{ runner.os }}
10876

10977
- name: Create Directory Structure
11078
env:

.github/workflows/publish-release.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,10 @@ jobs:
129129
persist-credentials: false
130130

131131
- name: Install Zig
132-
env:
133-
ZIG: ${{ env.zig }}
134-
run: |
135-
curl -L https://ziglang.org/download/${ZIG}/zig-x86_64-linux-${ZIG}.tar.xz -o zig.tar.xz
136-
mkdir -p $HOME/.local/bin
137-
tar -xf zig.tar.xz -C $HOME/.local/bin
138-
echo "$HOME/.local/bin/zig-x86_64-linux-${ZIG}" >> $GITHUB_PATH
139-
rm zig.tar.xz
132+
uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1
133+
with:
134+
version: ${{ env.zig }}
135+
use-cache: false
140136

141137
- name: Install Go
142138
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0

.github/workflows/unit-test.yml

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -86,44 +86,12 @@ jobs:
8686
go-version: ${{ env.go }}
8787
check-latest: true
8888

89-
- name: Cache Zig
89+
- name: Install Zig
9090
if: runner.os == 'Linux'
91-
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
91+
uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1
9292
with:
93-
path: ~/.local/bin
94-
key: zig-${{ env.zig }}-${{ runner.arch }}-${{ runner.os }}
95-
96-
- name: Install Zig
97-
env:
98-
RUNNER_ARCH: ${{ runner.arch }}
99-
ENV_ZIG: ${{ env.zig }}
100-
run: |
101-
if [[ "${RUNNER_ARCH}" == "X64" ]]; then
102-
ZIG_ARCH="x86_64"
103-
elif [[ "${RUNNER_ARCH}" == "ARM64" ]]; then
104-
ZIG_ARCH="aarch64"
105-
else
106-
echo "Unsupported architecture: ${RUNNER_ARCH}"
107-
exit 1
108-
fi
109-
110-
ZIG_DIR="zig-${ZIG_ARCH}-linux-${ENV_ZIG}"
111-
ZIG_TARBALL="${ZIG_DIR}.tar.xz"
112-
ZIG_DIR_PATH="$HOME/.local/bin/${ZIG_DIR}"
113-
114-
# If cached Zig already exists, add it to PATH and skip download
115-
if [ -d "${ZIG_DIR_PATH}" ]; then
116-
echo "Found cached Zig at ${ZIG_DIR_PATH}"
117-
echo "${ZIG_DIR_PATH}" >> $GITHUB_PATH
118-
exit 0
119-
fi
120-
121-
# Otherwise download and extract Zig, then add to PATH
122-
curl -L https://ziglang.org/download/${ENV_ZIG}/${ZIG_TARBALL} -o zig.tar.xz
123-
mkdir -p $HOME/.local/bin
124-
tar -xf zig.tar.xz -C $HOME/.local/bin
125-
echo "${ZIG_DIR_PATH}" >> $GITHUB_PATH
126-
rm zig.tar.xz
93+
version: ${{ env.zig }}
94+
cache-key: zig-${{ env.zig }}-${{ runner.arch }}-${{ runner.os }}
12795

12896
- name: Set CGO
12997
env:

0 commit comments

Comments
 (0)