Skip to content

Commit f0773a3

Browse files
Merge pull request #219 from lightpanda-io/ci-deps
ci: force netsurf build deps each time
2 parents 7347e1d + f9cff76 commit f0773a3

File tree

5 files changed

+5
-127
lines changed

5 files changed

+5
-127
lines changed

.github/actions/install/action.yml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,11 @@ 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
17+
- name: libiconv
1818
shell: bash
1919
run: |
2020
ln -s /usr/local/lib/libiconv vendor/libiconv
2121
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.
35-
- name: install build dependencies
36-
if: steps.changes.outputs.netsurf == 'true'
37-
shell: bash
38-
run: |
39-
apt update && \
40-
apt install -y git curl bash xz-utils python3 ca-certificates pkg-config \
41-
libglib2.0-dev gperf libexpat1-dev cmake build-essential
42-
43-
# if netsurf has changed, force a rebuild.
44-
- name: re-build netsurf
45-
if: steps.changes.outputs.netsurf == 'true'
22+
- name: build netsurf
4623
shell: bash
47-
run: |
48-
make clean-netsurf
49-
make install-netsurf
24+
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: 0 additions & 5 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

.github/workflows/zig-test.yml

Lines changed: 2 additions & 7 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
@@ -69,8 +64,8 @@ jobs:
6964
zig-build-release:
7065
name: zig build release
7166

72-
# Don't run the CI with draft PR.
73-
if: github.event.pull_request.draft == false
67+
# Don't run the CI on PR
68+
if: github.event_name != 'pull_request'
7469

7570
runs-on: ubuntu-latest
7671
container:

Dockerfile.deps

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

0 commit comments

Comments
 (0)