From d6d1cdc66388ab4adb1fa8f37833d2320b8dc71e Mon Sep 17 00:00:00 2001 From: tudor Date: Wed, 27 Nov 2024 12:42:04 +0100 Subject: [PATCH] progress --- .github/workflows/docker_test.yml | 17 ++++++++++------- cibuild/build-with-docker.sh | 14 +++++++------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker_test.yml b/.github/workflows/docker_test.yml index f9775328..44c426c4 100644 --- a/.github/workflows/docker_test.yml +++ b/.github/workflows/docker_test.yml @@ -4,13 +4,13 @@ on: workflow_dispatch: inputs: message: - description: 'Test docker running' + description: 'Build as described in README.md' push: branches: - 'tudor/feat-docker-action' jobs: - run_container: + readmemd_build: runs-on: ubuntu-latest services: docker: @@ -19,7 +19,7 @@ jobs: ports: - 2375:2375 container: - image: ubuntu:latest + image: node:20 steps: - name: Checkout uses: actions/checkout@v4 @@ -27,9 +27,12 @@ jobs: - name: Install Docker run: | apt-get update - apt-get install -y docker.io + apt-get install -y docker.io git wget - - name: Test Docker + - name: Install pnpm + uses: pnpm/action-setup@v4 + + - name: Build all run: | - docker version - docker info \ No newline at end of file + pnpm install + pnpm build:all \ No newline at end of file diff --git a/cibuild/build-with-docker.sh b/cibuild/build-with-docker.sh index 91f0c24c..adfcaf8e 100755 --- a/cibuild/build-with-docker.sh +++ b/cibuild/build-with-docker.sh @@ -22,12 +22,12 @@ docker run \ -e OBJDUMP=${OBJDUMP:-true} \ -e SDK_ARCHIVE \ -e WASI_SDK_ARCHIVE \ - -v ./cibuild.sh:/workspace/cibuild.sh:rw \ - -v ./.buildconfig:/workspace/.buildconfig:rw \ - -v ./extra:/workspace/extra:rw \ - -v ./cibuild:/workspace/cibuild:rw \ - -v ./patches:/opt/patches:rw \ - -v ./tests:/workspace/tests:rw \ - -v ./packages/pglite:/workspace/packages/pglite:rw \ + -v "/$(pwd)/cibuild.sh:/workspace/cibuild.sh:rw" \ + -v "/$(pwd)/.buildconfig:/workspace/.buildconfig:rw" \ + -v "/$(pwd)/extra:/workspace/extra:rw" \ + -v "/$(pwd)/cibuild:/workspace/cibuild:rw" \ + -v "/$(pwd)/patches:/opt/patches:rw" \ + -v "/$(pwd)/tests:/workspace/tests:rw" \ + -v "/$(pwd)/packages/pglite:/workspace/packages/pglite:rw" \ $IMG_NAME:$IMG_TAG \ bash ./cibuild/build-all.sh \ No newline at end of file