Skip to content

Commit 63133f3

Browse files
committed
Refactor build
1 parent 4e51ada commit 63133f3

File tree

10 files changed

+136
-313
lines changed

10 files changed

+136
-313
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -151,30 +151,6 @@ jobs:
151151
body: body
152152
});
153153
154-
- name: "outdated packages (musl64)"
155-
uses: "actions/github-script@v7"
156-
if: ${{ github.event_name == 'pull_request' }}
157-
with:
158-
github-token: "${{ secrets.GITHUB_TOKEN }}"
159-
script: |
160-
let fs = require('fs');
161-
let body = "<details>\n";
162-
body += "<summary>\n\n";
163-
body = "## Outdated packages (musl64):\n";
164-
body += "</summary>\n\n";
165-
body += fs.readFileSync('/tmp/dpdk-sys/builds/env.sysroot.musl64.outdated.md');
166-
body += "\n</details>\n";
167-
const maxLength = 65535;
168-
if (body.length > maxLength) {
169-
const warning = "\n...output truncated due to length limits...\n";
170-
body = body.slice(0, maxLength - warning.length) + warning;
171-
}
172-
github.rest.issues.createComment({
173-
issue_number: context.issue.number,
174-
owner: context.repo.owner,
175-
repo: context.repo.repo,
176-
body: body
177-
});
178154
179155
- name: "Vulnerable packages (gnu64)"
180156
uses: "actions/github-script@v7"
@@ -201,31 +177,6 @@ jobs:
201177
body: body
202178
});
203179
204-
- name: "Vulnerable packages (musl64)"
205-
uses: "actions/github-script@v7"
206-
if: ${{ github.event_name == 'pull_request' }}
207-
with:
208-
github-token: "${{ secrets.GITHUB_TOKEN }}"
209-
script: |
210-
let fs = require('fs');
211-
let body = "<details>\n";
212-
body += "<summary>\n\n";
213-
body = "## Vulnerable packages (musl64):\n";
214-
body += "</summary>\n\n";
215-
body += fs.readFileSync('/tmp/dpdk-sys/builds/env.sysroot.musl64.vulns.triage.md');
216-
body += "\n</details>\n";
217-
const maxLength = 65535;
218-
if (body.length > maxLength) {
219-
const warning = "\n...output truncated due to length limits...\n";
220-
body = body.slice(0, maxLength - warning.length) + warning;
221-
}
222-
github.rest.issues.createComment({
223-
issue_number: context.issue.number,
224-
owner: context.repo.owner,
225-
repo: context.repo.repo,
226-
body: body
227-
});
228-
229180
- name: "Setup tmate session for debug"
230181
if: ${{ failure() && github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
231182
uses: "mxschmitt/action-tmate@v3"

Dockerfile

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,2 @@
1-
ARG TAG="latest"
2-
FROM ghcr.io/githedgehog/dpdk-sys/compile-env:${TAG} AS compile-env
3-
FROM ghcr.io/githedgehog/dpdk-sys/doc-env:${TAG} AS doc-env
4-
FROM ghcr.io/githedgehog/dpdk-sys/dev-env:${TAG} AS dev-env
5-
SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
6-
7-
# I can't properly set permissions in nix because of the way it works.
8-
# So I have to do this hacky thing to get sudo to work.
9-
# Also, ldconfig breaks in nix settings.
10-
# Normally that doesn't matter but it is called by vscode in the dev container
11-
# so we need to remove it to make that work.
12-
RUN chmod 777 /tmp \
13-
&& chmod 4755 /sbin/sudo \
14-
&& chmod 555 /etc/pam.d \
15-
&& chmod -R 444 /etc/pam.d/* \
16-
&& chmod 444 /etc/group \
17-
&& chmod 444 /etc/passwd \
18-
&& rm /bin/ldconfig \
19-
&& mkdir -p /home/runner \
20-
&& chown -R runner:runner /home/runner
21-
22-
USER runner
23-
CMD ["/bin/bash", "--login"]
1+
ARG IMAGE=scratch
2+
FROM ${IMAGE}

builds.template.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ matrix:
2727
- "debug"
2828
target:
2929
- "x86_64-unknown-linux-gnu"
30-
- "x86_64-unknown-linux-musl"
3130
just: *just_version
3231
nixpkgs:
3332
- *nixpkgs_unstable

builds.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ matrix:
2727
- "debug"
2828
target:
2929
- "x86_64-unknown-linux-gnu"
30-
- "x86_64-unknown-linux-musl"
3130
just: *just_version
3231
nixpkgs:
3332
- *nixpkgs_unstable

0 commit comments

Comments
 (0)