Skip to content

Commit d6d1cdc

Browse files
author
tudor
committed
progress
1 parent 2ff027d commit d6d1cdc

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

.github/workflows/docker_test.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
workflow_dispatch:
55
inputs:
66
message:
7-
description: 'Test docker running'
7+
description: 'Build as described in README.md'
88
push:
99
branches:
1010
- 'tudor/feat-docker-action'
1111

1212
jobs:
13-
run_container:
13+
readmemd_build:
1414
runs-on: ubuntu-latest
1515
services:
1616
docker:
@@ -19,17 +19,20 @@ jobs:
1919
ports:
2020
- 2375:2375
2121
container:
22-
image: ubuntu:latest
22+
image: node:20
2323
steps:
2424
- name: Checkout
2525
uses: actions/checkout@v4
2626

2727
- name: Install Docker
2828
run: |
2929
apt-get update
30-
apt-get install -y docker.io
30+
apt-get install -y docker.io git wget
3131
32-
- name: Test Docker
32+
- name: Install pnpm
33+
uses: pnpm/action-setup@v4
34+
35+
- name: Build all
3336
run: |
34-
docker version
35-
docker info
37+
pnpm install
38+
pnpm build:all

cibuild/build-with-docker.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ docker run \
2222
-e OBJDUMP=${OBJDUMP:-true} \
2323
-e SDK_ARCHIVE \
2424
-e WASI_SDK_ARCHIVE \
25-
-v ./cibuild.sh:/workspace/cibuild.sh:rw \
26-
-v ./.buildconfig:/workspace/.buildconfig:rw \
27-
-v ./extra:/workspace/extra:rw \
28-
-v ./cibuild:/workspace/cibuild:rw \
29-
-v ./patches:/opt/patches:rw \
30-
-v ./tests:/workspace/tests:rw \
31-
-v ./packages/pglite:/workspace/packages/pglite:rw \
25+
-v "/$(pwd)/cibuild.sh:/workspace/cibuild.sh:rw" \
26+
-v "/$(pwd)/.buildconfig:/workspace/.buildconfig:rw" \
27+
-v "/$(pwd)/extra:/workspace/extra:rw" \
28+
-v "/$(pwd)/cibuild:/workspace/cibuild:rw" \
29+
-v "/$(pwd)/patches:/opt/patches:rw" \
30+
-v "/$(pwd)/tests:/workspace/tests:rw" \
31+
-v "/$(pwd)/packages/pglite:/workspace/packages/pglite:rw" \
3232
$IMG_NAME:$IMG_TAG \
3333
bash ./cibuild/build-all.sh

0 commit comments

Comments
 (0)