From be6d83b3bda8e736a601468be81712b97c71b446 Mon Sep 17 00:00:00 2001 From: spwoodcock Date: Wed, 29 May 2024 15:10:20 +0100 Subject: [PATCH 1/2] build: update WITH_MONITORING in dockerfile to MONITORING --- src/backend/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile index ccdf858cc1..65c5a11c2f 100644 --- a/src/backend/Dockerfile +++ b/src/backend/Dockerfile @@ -64,7 +64,7 @@ RUN pdm export --prod > requirements.txt \ FROM base as build # NOTE this argument is specified during production build on Github workflow # NOTE only the production API image contains the monitoring dependencies -ARG WITH_MONITORING +ARG MONITORING RUN set -ex \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install \ @@ -84,7 +84,7 @@ COPY --from=extract-deps \ /opt/python/ # Install with or without monitoring, depending on flag RUN pip install --user --no-warn-script-location --no-cache-dir \ - $(if [ "$WITH_MONITORING" = "true" ]; then \ + $(if [ "$MONITORING" = "true" ]; then \ echo "-r /opt/python/requirements-monitoring.txt"; \ else \ echo "-r /opt/python/requirements.txt"; \ From e3cf8a63816d952c9f81797bd5ee5c702353d2e3 Mon Sep 17 00:00:00 2001 From: spwoodcock Date: Wed, 29 May 2024 15:11:00 +0100 Subject: [PATCH 2/2] ci: update all gh-workflows --> v1.5.2 --- .github/workflows/build_and_deploy.yml | 10 +++++----- .github/workflows/build_ci_img.yml | 2 +- .github/workflows/build_odk_imgs.yml | 4 ++-- .github/workflows/build_proxy_imgs.yml | 8 ++++---- .github/workflows/docs.yml | 6 +++--- .github/workflows/pr_test_backend.yml | 2 +- .github/workflows/pr_test_frontend.yml | 2 +- .github/workflows/tag_build.yml | 2 +- .github/workflows/wiki.yml | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 4e4f91227e..8873efe613 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -17,7 +17,7 @@ on: jobs: pytest: - uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@1.5.2 with: image_name: ghcr.io/${{ github.repository }}/backend build_context: src/backend @@ -29,12 +29,12 @@ jobs: secrets: inherit frontend-tests: - uses: hotosm/gh-workflows/.github/workflows/test_pnpm.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/test_pnpm.yml@1.5.2 with: working_dir: src/frontend backend-build: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 needs: [pytest] with: context: src/backend @@ -42,7 +42,7 @@ jobs: image_name: ghcr.io/${{ github.repository }}/backend frontend-build: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 needs: [frontend-tests] with: context: src/frontend @@ -152,7 +152,7 @@ jobs: needs: - smoke-test-backend - smoke-test-frontend - uses: hotosm/gh-workflows/.github/workflows/remote_deploy.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/remote_deploy.yml@1.5.2 with: environment: ${{ github.ref_name }} docker_compose_file: "docker-compose.${{ github.ref_name }}.yml" diff --git a/.github/workflows/build_ci_img.yml b/.github/workflows/build_ci_img.yml index d3a1f183ed..9205316eba 100644 --- a/.github/workflows/build_ci_img.yml +++ b/.github/workflows/build_ci_img.yml @@ -16,7 +16,7 @@ on: jobs: backend-ci-build: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 with: context: src/backend build_target: ci diff --git a/.github/workflows/build_odk_imgs.yml b/.github/workflows/build_odk_imgs.yml index 7e266378b5..4ded2d2c3a 100644 --- a/.github/workflows/build_odk_imgs.yml +++ b/.github/workflows/build_odk_imgs.yml @@ -13,7 +13,7 @@ on: jobs: build-odkcentral: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 with: context: odkcentral/api image_tags: | @@ -26,7 +26,7 @@ jobs: # multi_arch: true build-odkcentral-ui: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 with: context: odkcentral/ui image_tags: | diff --git a/.github/workflows/build_proxy_imgs.yml b/.github/workflows/build_proxy_imgs.yml index 7d5e9b4602..57bd08f748 100644 --- a/.github/workflows/build_proxy_imgs.yml +++ b/.github/workflows/build_proxy_imgs.yml @@ -10,7 +10,7 @@ on: jobs: build-cert-init-main: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 with: context: nginx build_target: certs-init-main @@ -21,7 +21,7 @@ jobs: multi_arch: true build-cert-init-dev: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 with: context: nginx build_target: certs-init-development @@ -33,7 +33,7 @@ jobs: multi_arch: true build-proxy-main: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 with: context: nginx build_target: main @@ -44,7 +44,7 @@ jobs: multi_arch: true build-proxy-dev: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 with: context: nginx build_target: development diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c1247eb8f1..573967bdd3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -12,19 +12,19 @@ on: jobs: build_doxygen: - uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@1.5.2 with: output_path: docs/apidocs build_openapi_json: - uses: hotosm/gh-workflows/.github/workflows/openapi_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/openapi_build.yml@1.5.2 with: image: ghcr.io/${{ github.repository }}/backend:ci-${{ github.ref_name }} example_env_file_path: ".env.example" output_path: docs/openapi.json publish_docs: - uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@1.5.2 needs: - build_doxygen - build_openapi_json diff --git a/.github/workflows/pr_test_backend.yml b/.github/workflows/pr_test_backend.yml index 07e0257b13..e445392150 100644 --- a/.github/workflows/pr_test_backend.yml +++ b/.github/workflows/pr_test_backend.yml @@ -14,7 +14,7 @@ on: jobs: pytest: - uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@1.5.2 with: image_name: ghcr.io/${{ github.repository }}/backend build_context: src/backend diff --git a/.github/workflows/pr_test_frontend.yml b/.github/workflows/pr_test_frontend.yml index 69d90a5f1f..3daafb3a40 100644 --- a/.github/workflows/pr_test_frontend.yml +++ b/.github/workflows/pr_test_frontend.yml @@ -14,7 +14,7 @@ on: jobs: unit-tests: - uses: hotosm/gh-workflows/.github/workflows/test_pnpm.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/test_pnpm.yml@1.5.2 with: working_dir: src/frontend diff --git a/.github/workflows/tag_build.yml b/.github/workflows/tag_build.yml index 357109cab7..0d20bcbe61 100644 --- a/.github/workflows/tag_build.yml +++ b/.github/workflows/tag_build.yml @@ -9,7 +9,7 @@ on: jobs: backend-build: - uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.2 with: context: src/backend build_target: prod diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml index e78ccba139..47869a60c7 100644 --- a/.github/workflows/wiki.yml +++ b/.github/workflows/wiki.yml @@ -10,6 +10,6 @@ on: jobs: publish-docs-to-wiki: - uses: hotosm/gh-workflows/.github/workflows/wiki.yml@1.5.1 + uses: hotosm/gh-workflows/.github/workflows/wiki.yml@1.5.2 with: homepage_path: "wiki_redirect.md"