Skip to content

Commit e71fd17

Browse files
committed
Tweaking extension loading for static/shared libs
1 parent 178b71e commit e71fd17

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

.github/workflows/build.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,6 @@ jobs:
2424
- name: Install docker-compose
2525
run: sudo apt update && sudo apt install docker-compose -y
2626

27-
- name: Cache Docker image
28-
id: cache-docker-image
29-
uses: actions/cache@v3
30-
with:
31-
path: /tmp/builder-image.tar
32-
key: ${{ runner.os }}-docker-${{ hashFiles('emscripten-builder.dockerfile') }}
33-
34-
- name: Load builder image if cached
35-
if: steps.cache-docker-image.outputs.cache-hit == 'true'
36-
run: docker load -i /tmp/builder-image.tar
37-
38-
- name: Create builder image (if not cached)
39-
if: steps.cache-docker-image.outputs.cache-hit != 'true'
40-
run: |
41-
time make image
42-
docker save -o /tmp/builder-image.tar seanmorris/php-emscripten-builder:latest
43-
4427
- name: Install NPM packages
4528
run: npm ci
4629

@@ -51,13 +34,6 @@ jobs:
5134
jq -c . dynamic-libs.json
5235
echo "libgroups=$(jq -c . dynamic-libs.json)" >> "$GITHUB_OUTPUT"
5336
54-
- name: Cache Docker image
55-
id: cache-docker-image
56-
uses: actions/cache@v3
57-
with:
58-
path: /tmp/builder-image.tar
59-
key: ${{ runner.os }}-docker-${{ hashFiles('emscripten-builder.dockerfile') }}
60-
6137
- name: Import configuration
6238
run: cp -p .github/.env_8.4.dynamic.ci .env
6339

.github/workflows/test.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Test
22

33
on: [push]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
59
jobs:
610

711
test-8-4-static:

0 commit comments

Comments
 (0)