Skip to content

Commit 8d3a6e7

Browse files
committed
ci: force netsurf build deps each time
1 parent 7347e1d commit 8d3a6e7

File tree

5 files changed

+6
-126
lines changed

5 files changed

+6
-126
lines changed

.github/actions/install/action.yml

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,13 @@ runs:
1414
mkdir -p vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/release
1515
ln -s /usr/local/lib/libc_v8.a vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/release/libc_v8.a
1616
17-
- name: install deps
18-
shell: bash
19-
run: |
20-
ln -s /usr/local/lib/libiconv vendor/libiconv
21-
22-
ln -s /usr/local/lib/netsurf/build vendor/netsurf/build
23-
ln -s /usr/local/lib/netsurf/lib vendor/netsurf/lib
24-
ln -s /usr/local/lib/netsurf/include vendor/netsurf/include
25-
26-
# detect file change
27-
- uses: dorny/[email protected]
28-
id: changes
29-
with:
30-
filters: |
31-
netsurf:
32-
- 'vendor/netsurf/**'
33-
34-
# if a vendor has changed, install build dependencies.
3517
- name: install build dependencies
36-
if: steps.changes.outputs.netsurf == 'true'
3718
shell: bash
3819
run: |
3920
apt update && \
4021
apt install -y git curl bash xz-utils python3 ca-certificates pkg-config \
4122
libglib2.0-dev gperf libexpat1-dev cmake build-essential
4223
43-
# if netsurf has changed, force a rebuild.
44-
- name: re-build netsurf
45-
if: steps.changes.outputs.netsurf == 'true'
24+
- name: build netsurf
4625
shell: bash
47-
run: |
48-
make clean-netsurf
49-
make install-netsurf
26+
run: make install-netsurf

.github/workflows/build-deps.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/wpt.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ on:
3636
# Allows you to run this workflow manually from the Actions tab
3737
workflow_dispatch:
3838

39-
permissions:
40-
pull-requests: read # required for dorny/paths-filter
41-
contents: read
42-
packages: read
43-
4439
jobs:
4540
wpt:
4641
name: web platform tests
@@ -50,7 +45,7 @@ jobs:
5045

5146
runs-on: ubuntu-latest
5247
container:
53-
image: ghcr.io/lightpanda-io/zig-browsercore:0.12.0-dev.1773-8a8fd47d2
48+
image: ghcr.io/lightpanda-io/zig-v8:0.12.0-dev.1773-8a8fd47d2
5449
credentials:
5550
username: ${{ github.actor }}
5651
password: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/zig-test.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ on:
3434
# Allows you to run this workflow manually from the Actions tab
3535
workflow_dispatch:
3636

37-
permissions:
38-
pull-requests: read # required for dorny/paths-filter
39-
contents: read
40-
packages: read
41-
4237
jobs:
4338
zig-build-dev:
4439
name: zig build dev
@@ -48,7 +43,7 @@ jobs:
4843

4944
runs-on: ubuntu-latest
5045
container:
51-
image: ghcr.io/lightpanda-io/zig-browsercore:0.12.0-dev.1773-8a8fd47d2
46+
image: ghcr.io/lightpanda-io/zig-v8:0.12.0-dev.1773-8a8fd47d2
5247
credentials:
5348
username: ${{ github.actor }}
5449
password: ${{ secrets.GITHUB_TOKEN }}
@@ -74,7 +69,7 @@ jobs:
7469

7570
runs-on: ubuntu-latest
7671
container:
77-
image: ghcr.io/lightpanda-io/zig-browsercore:0.12.0-dev.1773-8a8fd47d2
72+
image: ghcr.io/lightpanda-io/zig-v8:0.12.0-dev.1773-8a8fd47d2
7873
credentials:
7974
username: ${{ github.actor }}
8075
password: ${{ secrets.GITHUB_TOKEN }}
@@ -100,7 +95,7 @@ jobs:
10095

10196
runs-on: ubuntu-latest
10297
container:
103-
image: ghcr.io/lightpanda-io/zig-browsercore:0.12.0-dev.1773-8a8fd47d2
98+
image: ghcr.io/lightpanda-io/zig-v8:0.12.0-dev.1773-8a8fd47d2
10499
credentials:
105100
username: ${{ github.actor }}
106101
password: ${{ secrets.GITHUB_TOKEN }}

Dockerfile.deps

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)