Skip to content

Commit f0e6ed8

Browse files
gnurizenclaude
andcommitted
ci: move systemtap-sdt-dev to env action, trim apt installs
- Move systemtap-sdt-dev install into .github/workflows/env/action.yml since it's a build dependency for support/usdt/test (sys/sdt.h) - Remove per-job Install dependencies steps from lint and test jobs - Remove debootstrap from lint and test (only distro-qemu needs it) - Add --no-install-recommends to distro-qemu apt installs Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent d8b5dc8 commit f0e6ed8

2 files changed

Lines changed: 8 additions & 12 deletions

File tree

.github/workflows/env/action.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ runs:
1414
# Skip translations to speed up apt-get update
1515
echo 'Acquire::Languages "none";' | sudo tee /etc/apt/apt.conf.d/99no-translations > /dev/null
1616
# Makefile expects ARCH-linux-gnu-gcc; install if not available
17+
sudo apt-get update
18+
# systemtap-sdt-dev provides sys/sdt.h needed by support/usdt/test
19+
sudo apt-get install -y --no-install-recommends systemtap-sdt-dev
20+
# Makefile expects ARCH-linux-gnu-gcc; install if not available
1721
case "$(uname -m)" in
18-
x86_64) command -v x86_64-linux-gnu-gcc >/dev/null || { sudo apt-get update && sudo apt-get install -y gcc-x86-64-linux-gnu; } ;;
19-
aarch64) command -v aarch64-linux-gnu-gcc >/dev/null || { sudo apt-get update && sudo apt-get install -y gcc-aarch64-linux-gnu; } ;;
22+
x86_64) command -v x86_64-linux-gnu-gcc >/dev/null || sudo apt-get install -y gcc-x86-64-linux-gnu ;;
23+
aarch64) command -v aarch64-linux-gnu-gcc >/dev/null || sudo apt-get install -y gcc-aarch64-linux-gnu ;;
2024
esac
2125
- name: Set up Go
2226
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0

.github/workflows/unit-test-on-pull-request.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ jobs:
4242
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4343
- name: Set up environment
4444
uses: ./.github/workflows/env
45-
- name: Install dependencies
46-
run: |
47-
sudo apt-get update -y
48-
sudo apt-get install -y debootstrap systemtap-sdt-dev
4945
- name: linter
5046
env:
5147
CGO_ENABLED: 1
@@ -89,10 +85,6 @@ jobs:
8985
restore-keys: |
9086
coredumps-${{ matrix.target_arch }}
9187
coredumps-
92-
- name: Install dependencies
93-
run: |
94-
sudo apt-get update -y
95-
sudo apt-get install -y debootstrap systemtap-sdt-dev
9688
- name: Tests
9789
run: make test TARGET_ARCH=${{ matrix.target_arch }} GO_FLAGS="${{ matrix.go_flags }}"
9890

@@ -291,10 +283,10 @@ jobs:
291283
sudo apt-get update -y
292284
case "${{ matrix.target_arch }}" in
293285
amd64) sudo apt-get -y --no-install-recommends --no-install-suggests install qemu-system-x86;;
294-
arm64) sudo apt-get -y install qemu-system-arm ipxe-qemu gcc-aarch64-linux-gnu libc6-arm64-cross libc6:arm64 binutils-aarch64-linux-gnu musl-dev:arm64 systemtap-sdt-dev:arm64;;
286+
arm64) sudo apt-get -y install qemu-system-arm ipxe-qemu gcc-aarch64-linux-gnu libc6-arm64-cross libc6:arm64 binutils-aarch64-linux-gnu musl-dev:arm64;;
295287
*) echo >&2 "bug: bad arch selected"; exit 1;;
296288
esac
297-
sudo apt-get install -y debootstrap systemtap-sdt-dev
289+
sudo apt-get install -y --no-install-recommends debootstrap
298290
- name: Get parcagpu image digest
299291
id: parcagpu-digest
300292
run: |

0 commit comments

Comments
 (0)