From 12c808f0052f088bad3033c06917d2ece7fd82c0 Mon Sep 17 00:00:00 2001 From: benoit74 Date: Fri, 24 May 2024 14:25:32 +0000 Subject: [PATCH] Fix Javascript build script --- .github/workflows/Publish.yaml | 4 ++-- .github/workflows/PublishDockerDevImage.yaml | 3 ++- .github/workflows/QA.yaml | 4 ++-- .github/workflows/TestWebsite.yaml | 2 +- .github/workflows/Tests.yaml | 12 ++++++------ build_js.sh | 2 ++ 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/Publish.yaml b/.github/workflows/Publish.yaml index 18ae2760..e2e0a034 100644 --- a/.github/workflows/Publish.yaml +++ b/.github/workflows/Publish.yaml @@ -11,10 +11,10 @@ jobs: id-token: write # mandatory for PyPI trusted publishing steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version-file: pyproject.toml architecture: x64 diff --git a/.github/workflows/PublishDockerDevImage.yaml b/.github/workflows/PublishDockerDevImage.yaml index 73503d05..07d7d4ed 100644 --- a/.github/workflows/PublishDockerDevImage.yaml +++ b/.github/workflows/PublishDockerDevImage.yaml @@ -4,13 +4,14 @@ on: push: branches: - main + - test-build jobs: publish: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build Javascript wombatSetup.js uses: addnab/docker-run-action@v3 diff --git a/.github/workflows/QA.yaml b/.github/workflows/QA.yaml index 2a1ac3cb..95c24a72 100644 --- a/.github/workflows/QA.yaml +++ b/.github/workflows/QA.yaml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version-file: pyproject.toml architecture: x64 diff --git a/.github/workflows/TestWebsite.yaml b/.github/workflows/TestWebsite.yaml index 6c62b9ff..c3fca528 100644 --- a/.github/workflows/TestWebsite.yaml +++ b/.github/workflows/TestWebsite.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build and push Docker image uses: openzim/docker-publish-action@v10 diff --git a/.github/workflows/Tests.yaml b/.github/workflows/Tests.yaml index 163d9c0d..c8538159 100644 --- a/.github/workflows/Tests.yaml +++ b/.github/workflows/Tests.yaml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version-file: pyproject.toml architecture: x64 @@ -31,7 +31,7 @@ jobs: run: inv coverage --args "-vvv" - name: Upload coverage report to codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} @@ -51,10 +51,10 @@ jobs: build_python: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version-file: pyproject.toml architecture: x64 @@ -75,7 +75,7 @@ jobs: build_docker: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Ensure we can build the Docker image run: | diff --git a/build_js.sh b/build_js.sh index 67e4e235..f424871e 100755 --- a/build_js.sh +++ b/build_js.sh @@ -20,4 +20,6 @@ python3 -m venv /local cd /src/javascript +yarn install + OUTPUT_DIR=/output yarn build-prod