From 7f38dc172724cdf0e871be3ce7316c0ab08faa5f Mon Sep 17 00:00:00 2001 From: Abhishek Dasgupta Date: Wed, 19 Oct 2022 09:05:31 +0100 Subject: [PATCH 1/3] ci: drop stable branches We aim to do more frequent releases, and will not be maintaining stable branches. Release candidates and releases are cut from main with deployments to QA and prod. --- .github/workflows/aggregate-ci.yml | 2 +- .github/workflows/curator-api-node.yml | 2 +- .github/workflows/curator-service-package.yml | 2 +- .github/workflows/curator-ui-node.yml | 2 +- .github/workflows/data-service-node.yml | 2 +- .github/workflows/data-service-package.yml | 2 +- .github/workflows/geocoding-service-package.yml | 2 +- .github/workflows/geocoding-service-python.yml | 2 +- .github/workflows/ingestion-cleanup-deploy.yml | 15 +-------------- .../workflows/ingestion-functions-deploy.yml | 17 +---------------- .../workflows/ingestion-functions-python.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- .github/workflows/reusable-data-service-ci.yml | 2 +- .../update-prod-curator-db-schema.yaml | 7 ++----- 14 files changed, 15 insertions(+), 46 deletions(-) diff --git a/.github/workflows/aggregate-ci.yml b/.github/workflows/aggregate-ci.yml index bc2836c92..f43bfdc1c 100644 --- a/.github/workflows/aggregate-ci.yml +++ b/.github/workflows/aggregate-ci.yml @@ -2,7 +2,7 @@ name: Aggregate CI on: push: - branches: [main, '*-stable'] + branches: [main] paths: - '.github/workflows/aggregate-ci.yml' - 'data-serving/scripts/aggregate-covid19/aggregate/**' diff --git a/.github/workflows/curator-api-node.yml b/.github/workflows/curator-api-node.yml index 2987a780d..134987721 100644 --- a/.github/workflows/curator-api-node.yml +++ b/.github/workflows/curator-api-node.yml @@ -5,7 +5,7 @@ name: Curator API Node.js CI on: push: - branches: [main, '*-stable'] + branches: [main] paths: - ".github/workflows/curator-api-node.yml" - "verification/curator-service/api/**" diff --git a/.github/workflows/curator-service-package.yml b/.github/workflows/curator-service-package.yml index 7a9f47282..94ced1a2c 100644 --- a/.github/workflows/curator-service-package.yml +++ b/.github/workflows/curator-service-package.yml @@ -3,7 +3,7 @@ name: Curator Service Github Packages Push on: # Build whenever a PR is merged into the main branch. push: - branches: [main, '*-stable'] + branches: [main] paths: - ".github/workflows/curator-service-package.yml" - "verification/curator-service/**" diff --git a/.github/workflows/curator-ui-node.yml b/.github/workflows/curator-ui-node.yml index 175377cc8..36b7aa03e 100644 --- a/.github/workflows/curator-ui-node.yml +++ b/.github/workflows/curator-ui-node.yml @@ -5,7 +5,7 @@ name: Curator UI Node.js CI on: push: - branches: [main, '*-stable'] + branches: [main] paths: - ".github/workflows/curator-ui-node.yml" - "verification/curator-service/ui/**" diff --git a/.github/workflows/data-service-node.yml b/.github/workflows/data-service-node.yml index 22d58a3db..79082119f 100644 --- a/.github/workflows/data-service-node.yml +++ b/.github/workflows/data-service-node.yml @@ -5,7 +5,7 @@ name: Data service Node.js CI on: push: - branches: [main, '*-stable'] + branches: [main] paths: - ".github/workflows/data-service-node.yml" - "data-serving/data-service/**" diff --git a/.github/workflows/data-service-package.yml b/.github/workflows/data-service-package.yml index 3706a1832..c2f0a6600 100644 --- a/.github/workflows/data-service-package.yml +++ b/.github/workflows/data-service-package.yml @@ -3,7 +3,7 @@ name: Data Service Github Packages Push on: # Build whenever a PR is merged into the main branch. push: - branches: [main, '*-stable'] + branches: [main] paths: - ".github/workflows/data-service-package.yml" - "data-serving/data-service/**" diff --git a/.github/workflows/geocoding-service-package.yml b/.github/workflows/geocoding-service-package.yml index fa8b9c6e7..5fddd2680 100644 --- a/.github/workflows/geocoding-service-package.yml +++ b/.github/workflows/geocoding-service-package.yml @@ -3,7 +3,7 @@ name: Geocoding Service Github Packages Push on: # Build whenever a PR is merged into the main branch. push: - branches: [main, '*-stable'] + branches: [main] paths: - ".github/workflows/geocoding-service-package.yml" - "geocoding/location-service/**" diff --git a/.github/workflows/geocoding-service-python.yml b/.github/workflows/geocoding-service-python.yml index 2367b4d91..06bae111e 100644 --- a/.github/workflows/geocoding-service-python.yml +++ b/.github/workflows/geocoding-service-python.yml @@ -2,7 +2,7 @@ name: Geocoding location-service Python CI on: push: - branches: [main, '*-stable'] + branches: [main] paths: - '.github/workflows/geocoding-service-python.yml' - 'geocoding/location-service/**' diff --git a/.github/workflows/ingestion-cleanup-deploy.yml b/.github/workflows/ingestion-cleanup-deploy.yml index d28456071..1243c46fe 100644 --- a/.github/workflows/ingestion-cleanup-deploy.yml +++ b/.github/workflows/ingestion-cleanup-deploy.yml @@ -2,7 +2,7 @@ name: Ingestion cleanup deploy on: push: - branches: [main, '*-stable'] + branches: [main] paths: - '.github/workflows/ingestion-cleanup-deploy.yml' - 'ingestion/functions/**' @@ -31,7 +31,6 @@ jobs: uses: aws-actions/amazon-ecr-login@v1 - name: Build, tag, and push image to Amazon ECR (latest) - if: ${{ github.ref == 'refs/heads/main' }} working-directory: ingestion/functions env: ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} @@ -41,15 +40,3 @@ jobs: docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY -f Dockerfile-clean . docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest - - - name: Build, tag, and push image to Amazon ECR (stable) - if: ${{ endsWith(github.ref, '-stable') }} - working-directory: ingestion/functions - env: - ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} - ECR_REPOSITORY: gdh-ingestor-cleanup - IMAGE_TAG: ${{ github.sha }} - run: | - docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:stable -f Dockerfile-clean . - docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG - docker push $ECR_REGISTRY/$ECR_REPOSITORY:stable diff --git a/.github/workflows/ingestion-functions-deploy.yml b/.github/workflows/ingestion-functions-deploy.yml index baad80e09..9f04ac644 100644 --- a/.github/workflows/ingestion-functions-deploy.yml +++ b/.github/workflows/ingestion-functions-deploy.yml @@ -2,7 +2,7 @@ name: Ingestion functions deploy on: push: - branches: [main, '*-stable'] + branches: [main] paths: - '.github/workflows/ingestion-functions-deploy.yml' - 'ingestion/functions/**' @@ -29,7 +29,6 @@ jobs: uses: aws-actions/amazon-ecr-login@v1 - name: Build, tag, and push image to Amazon ECR (latest) - if: ${{ contains(github.ref, 'main') }} working-directory: ingestion/functions env: NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_METRICS_URL }} @@ -41,17 +40,3 @@ jobs: docker build --build-arg NOTIFY_WEBHOOK_URL -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY . docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest - - - name: Build, tag, and push image to Amazon ECR (stable) - if: ${{ endsWith(github.ref, '-stable') }} - working-directory: ingestion/functions - env: - NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_METRICS_URL }} - ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} - ECR_REPOSITORY: gdh-ingestor - IMAGE_TAG: ${{ github.sha }} - SLACK_LOGS_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_INGESTION_LOGS_TEST }} - run: | - docker build --build-arg NOTIFY_WEBHOOK_URL -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:stable . - docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG - docker push $ECR_REGISTRY/$ECR_REPOSITORY:stable diff --git a/.github/workflows/ingestion-functions-python.yml b/.github/workflows/ingestion-functions-python.yml index 30e042f3c..226b2d901 100644 --- a/.github/workflows/ingestion-functions-python.yml +++ b/.github/workflows/ingestion-functions-python.yml @@ -2,7 +2,7 @@ name: Ingestion functions Python CI on: push: - branches: [main, '*-stable'] + branches: [main] paths: - '.github/workflows/ingestion-functions-python.yml' - 'ingestion/functions/**' diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index df47f5c51..9d52e0469 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -2,7 +2,7 @@ name: Integration Tests CI on: push: - branches: [main, "*-stable"] + branches: [main] paths: - ".github/workflows/integration-tests.yml" - "dev/docker-compose.yml" diff --git a/.github/workflows/reusable-data-service-ci.yml b/.github/workflows/reusable-data-service-ci.yml index 04ec2d52d..a2ce0eeeb 100644 --- a/.github/workflows/reusable-data-service-ci.yml +++ b/.github/workflows/reusable-data-service-ci.yml @@ -2,7 +2,7 @@ name: Re-usable Data Service Python CI on: push: - branches: [main, '*-stable'] + branches: [main] paths: - '.github/workflows/reusable-data-service-ci.yml' - 'data-serving/reusable-data-service/**' diff --git a/.github/workflows/update-prod-curator-db-schema.yaml b/.github/workflows/update-prod-curator-db-schema.yaml index 8a2d51ba5..d93c47d39 100644 --- a/.github/workflows/update-prod-curator-db-schema.yaml +++ b/.github/workflows/update-prod-curator-db-schema.yaml @@ -2,11 +2,8 @@ name: Migrate prod database schema on: push: - # Run workflow when the schema changes. The branch name should always reflect the current release! - branches: [1.11-stable] - paths: - - "data-serving/scripts/setup-db/migrations/**" - - ".github/workflows/update-prod-curator-db-schema.yaml" + tags: # only run on semver tags + - '[0-9]+.[0-9]+.[0-9]+' workflow_dispatch: jobs: From 3dba391c58ea420ce80bd8abe93770203aa8aac5 Mon Sep 17 00:00:00 2001 From: Abhishek Dasgupta Date: Wed, 19 Oct 2022 09:09:32 +0100 Subject: [PATCH 2/3] ci: add QA db migration workflow --- ...yaml => update-prod-curator-db-schema.yml} | 0 .../workflows/update-qa-curator-db-schema.yml | 26 +++++++++++++++++++ 2 files changed, 26 insertions(+) rename .github/workflows/{update-prod-curator-db-schema.yaml => update-prod-curator-db-schema.yml} (100%) create mode 100644 .github/workflows/update-qa-curator-db-schema.yml diff --git a/.github/workflows/update-prod-curator-db-schema.yaml b/.github/workflows/update-prod-curator-db-schema.yml similarity index 100% rename from .github/workflows/update-prod-curator-db-schema.yaml rename to .github/workflows/update-prod-curator-db-schema.yml diff --git a/.github/workflows/update-qa-curator-db-schema.yml b/.github/workflows/update-qa-curator-db-schema.yml new file mode 100644 index 000000000..cf210d1aa --- /dev/null +++ b/.github/workflows/update-qa-curator-db-schema.yml @@ -0,0 +1,26 @@ +name: Migrate QA database schema + +on: + push: + tags: + - '*' + workflow_dispatch: + +jobs: + update-sources-data: + runs-on: ubuntu-20.04 + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up Node.js + uses: actions/setup-node@v1 + with: + node-version: "16.x" + + - name: Migrate QA database + env: + CONN: ${{ secrets.DB_CONNECTION_URL_QA }} + DB: "covid19" + run: npm --prefix data-serving/scripts/setup-db run migrate From a9c877778d534db8b89d06072ca6b906bbb5bc68 Mon Sep 17 00:00:00 2001 From: Abhishek Dasgupta Date: Wed, 19 Oct 2022 09:19:45 +0100 Subject: [PATCH 3/3] ci: use newer action versions, replacing node 12 EOL ones Older versions of some GitHub Actions used node 12 which is EOL. This updates all actions to their latest versions. See: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ --- .github/workflows/aggregate-ci.yml | 4 ++-- .github/workflows/aggregate-deploy.yml | 2 +- .github/workflows/api-python-tests.yml | 4 ++-- .github/workflows/completeness.yml | 4 ++-- .github/workflows/curator-api-node.yml | 6 +++--- .github/workflows/curator-service-package.yml | 6 +++--- .github/workflows/curator-ui-node.yml | 6 +++--- .github/workflows/data-service-node.yml | 6 +++--- .github/workflows/data-service-package.yml | 6 +++--- .github/workflows/export-deploy.yml | 2 +- .github/workflows/export-tests.yml | 4 ++-- .github/workflows/freshness.yml | 4 ++-- .github/workflows/geocoding-service-package.yml | 6 +++--- .github/workflows/geocoding-service-python.yml | 4 ++-- .github/workflows/ingestion-cleanup-deploy.yml | 2 +- .github/workflows/ingestion-functions-deploy.yml | 2 +- .github/workflows/ingestion-functions-python.yml | 4 ++-- .github/workflows/integration-tests.yml | 2 +- .github/workflows/kubemon.yml | 4 ++-- .github/workflows/monitoring-notify.yml | 4 ++-- .github/workflows/monitoring-tests.yml | 4 ++-- .github/workflows/prune-deploy.yml | 2 +- .github/workflows/prune-uploads-tests.yml | 4 ++-- .github/workflows/r-package.yml | 2 +- .github/workflows/reusable-data-service-ci.yml | 4 ++-- .github/workflows/suggest-python.yml | 4 ++-- .github/workflows/update-dev-curator-db-schema.yml | 4 ++-- .github/workflows/update-prod-curator-db-schema.yml | 4 ++-- .github/workflows/update-qa-curator-db-schema.yml | 4 ++-- 29 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.github/workflows/aggregate-ci.yml b/.github/workflows/aggregate-ci.yml index f43bfdc1c..aa265829a 100644 --- a/.github/workflows/aggregate-ci.yml +++ b/.github/workflows/aggregate-ci.yml @@ -19,9 +19,9 @@ jobs: run: working-directory: data-serving/scripts/aggregate-covid19/aggregate steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Lint with flake8 diff --git a/.github/workflows/aggregate-deploy.yml b/.github/workflows/aggregate-deploy.yml index 53c683513..92a893f40 100644 --- a/.github/workflows/aggregate-deploy.yml +++ b/.github/workflows/aggregate-deploy.yml @@ -13,7 +13,7 @@ jobs: deploy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: diff --git a/.github/workflows/api-python-tests.yml b/.github/workflows/api-python-tests.yml index 488258927..a0e966f3c 100644 --- a/.github/workflows/api-python-tests.yml +++ b/.github/workflows/api-python-tests.yml @@ -19,9 +19,9 @@ jobs: run: working-directory: api/python steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/completeness.yml b/.github/workflows/completeness.yml index 0a480b128..051ddb099 100644 --- a/.github/workflows/completeness.yml +++ b/.github/workflows/completeness.yml @@ -11,7 +11,7 @@ jobs: run: working-directory: ingestion/monitoring steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: @@ -19,7 +19,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: eu-central-1 - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/curator-api-node.yml b/.github/workflows/curator-api-node.yml index 134987721..599c86122 100644 --- a/.github/workflows/curator-api-node.yml +++ b/.github/workflows/curator-api-node.yml @@ -20,9 +20,9 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: "12.x" - name: Build and test @@ -34,6 +34,6 @@ jobs: env: CI: true - name: Upload test coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 with: file: verification/curator-service/api/coverage/coverage-final.json diff --git a/.github/workflows/curator-service-package.yml b/.github/workflows/curator-service-package.yml index 94ced1a2c..1eca4bd17 100644 --- a/.github/workflows/curator-service-package.yml +++ b/.github/workflows/curator-service-package.yml @@ -24,7 +24,7 @@ jobs: contents: read steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Prepare id: prep @@ -45,14 +45,14 @@ jobs: echo ::set-output name=version::${VERSION} echo ::set-output name=tags::${TAGS} echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ') - - uses: docker/login-action@v1 + - uses: docker/login-action@v2 with: username: ${{ github.actor }} # https://github.com/globaldothealth/list/settings/secrets # https://docs.github.com/en/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images#authenticating-with-the-container-registry password: ${{ secrets.GITHUB_TOKEN }} registry: ghcr.io - - uses: docker/build-push-action@v2 + - uses: docker/build-push-action@v3 with: file: verification/curator-service/Dockerfile push: true diff --git a/.github/workflows/curator-ui-node.yml b/.github/workflows/curator-ui-node.yml index 36b7aa03e..0a8944269 100644 --- a/.github/workflows/curator-ui-node.yml +++ b/.github/workflows/curator-ui-node.yml @@ -20,9 +20,9 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: "12.x" - name: Build and test @@ -36,6 +36,6 @@ jobs: env: CI: true - name: Upload test coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 with: file: verification/curator-service/ui/coverage/coverage-final.json diff --git a/.github/workflows/data-service-node.yml b/.github/workflows/data-service-node.yml index 79082119f..da8d135b0 100644 --- a/.github/workflows/data-service-node.yml +++ b/.github/workflows/data-service-node.yml @@ -20,9 +20,9 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: "12.x" - name: Build and test @@ -34,6 +34,6 @@ jobs: env: CI: true - name: Upload test coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 with: file: data-serving/data-service/coverage/coverage-final.json diff --git a/.github/workflows/data-service-package.yml b/.github/workflows/data-service-package.yml index c2f0a6600..4b81028bf 100644 --- a/.github/workflows/data-service-package.yml +++ b/.github/workflows/data-service-package.yml @@ -23,7 +23,7 @@ jobs: contents: read steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Prepare id: prep @@ -42,14 +42,14 @@ jobs: TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}" fi echo ::set-output name=tags::${TAGS} - - uses: docker/login-action@v1 + - uses: docker/login-action@v2 with: username: ${{ github.actor }} # https://github.com/globaldothealth/list/settings/secrets # https://docs.github.com/en/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images#authenticating-with-the-container-registry password: ${{ secrets.GITHUB_TOKEN }} registry: ghcr.io - - uses: docker/build-push-action@v2 + - uses: docker/build-push-action@v3 with: file: data-serving/data-service/Dockerfile push: true diff --git a/.github/workflows/export-deploy.yml b/.github/workflows/export-deploy.yml index 0c549018e..6e5dd3a4c 100644 --- a/.github/workflows/export-deploy.yml +++ b/.github/workflows/export-deploy.yml @@ -13,7 +13,7 @@ jobs: deploy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: diff --git a/.github/workflows/export-tests.yml b/.github/workflows/export-tests.yml index eabba7475..e03694ca0 100644 --- a/.github/workflows/export-tests.yml +++ b/.github/workflows/export-tests.yml @@ -21,9 +21,9 @@ jobs: run: working-directory: data-serving/scripts/export-data steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.10 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.10' - name: Lint with shellcheck diff --git a/.github/workflows/freshness.yml b/.github/workflows/freshness.yml index 7582d2885..4d6b3d9b4 100644 --- a/.github/workflows/freshness.yml +++ b/.github/workflows/freshness.yml @@ -11,7 +11,7 @@ jobs: run: working-directory: ingestion/monitoring steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: @@ -19,7 +19,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: eu-central-1 - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/geocoding-service-package.yml b/.github/workflows/geocoding-service-package.yml index 5fddd2680..4121417cc 100644 --- a/.github/workflows/geocoding-service-package.yml +++ b/.github/workflows/geocoding-service-package.yml @@ -23,7 +23,7 @@ jobs: contents: read steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Prepare id: prep @@ -42,14 +42,14 @@ jobs: TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}" fi echo ::set-output name=tags::${TAGS} - - uses: docker/login-action@v1 + - uses: docker/login-action@v2 with: username: ${{ github.actor }} # https://github.com/globaldothealth/list/settings/secrets # https://docs.github.com/en/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images#authenticating-with-the-container-registry password: ${{ secrets.GITHUB_TOKEN }} registry: ghcr.io - - uses: docker/build-push-action@v2 + - uses: docker/build-push-action@v3 with: file: geocoding/location-service/Dockerfile push: true diff --git a/.github/workflows/geocoding-service-python.yml b/.github/workflows/geocoding-service-python.yml index 06bae111e..309cfca57 100644 --- a/.github/workflows/geocoding-service-python.yml +++ b/.github/workflows/geocoding-service-python.yml @@ -19,9 +19,9 @@ jobs: run: working-directory: geocoding/location-service steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.8 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 - name: Lint with flake8 diff --git a/.github/workflows/ingestion-cleanup-deploy.yml b/.github/workflows/ingestion-cleanup-deploy.yml index 1243c46fe..50c8cb513 100644 --- a/.github/workflows/ingestion-cleanup-deploy.yml +++ b/.github/workflows/ingestion-cleanup-deploy.yml @@ -18,7 +18,7 @@ jobs: deploy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: diff --git a/.github/workflows/ingestion-functions-deploy.yml b/.github/workflows/ingestion-functions-deploy.yml index 9f04ac644..cc4966ab8 100644 --- a/.github/workflows/ingestion-functions-deploy.yml +++ b/.github/workflows/ingestion-functions-deploy.yml @@ -16,7 +16,7 @@ jobs: deploy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: diff --git a/.github/workflows/ingestion-functions-python.yml b/.github/workflows/ingestion-functions-python.yml index 226b2d901..45ad28833 100644 --- a/.github/workflows/ingestion-functions-python.yml +++ b/.github/workflows/ingestion-functions-python.yml @@ -21,9 +21,9 @@ jobs: run: working-directory: ingestion/functions steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.8 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 - name: Lint with flake8 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 9d52e0469..699f8d283 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -28,7 +28,7 @@ jobs: name: Cypress tests on ${{ matrix.browser }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build stack run: docker-compose -f dev/docker-compose.yml -f dev/docker-compose.ci.yml up --build -d -V - uses: cypress-io/github-action@v4 diff --git a/.github/workflows/kubemon.yml b/.github/workflows/kubemon.yml index eee0395d0..0770cc5af 100644 --- a/.github/workflows/kubemon.yml +++ b/.github/workflows/kubemon.yml @@ -19,9 +19,9 @@ jobs: run: working-directory: k8s/monitoring steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.10 - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: '3.10' - name: Set up poetry diff --git a/.github/workflows/monitoring-notify.yml b/.github/workflows/monitoring-notify.yml index 55ffffc5e..76ae3dd73 100644 --- a/.github/workflows/monitoring-notify.yml +++ b/.github/workflows/monitoring-notify.yml @@ -12,7 +12,7 @@ jobs: run: working-directory: ingestion/monitoring steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: @@ -21,7 +21,7 @@ jobs: aws-region: eu-central-1 - name: Set up Python 3.8 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 - name: Install dependencies diff --git a/.github/workflows/monitoring-tests.yml b/.github/workflows/monitoring-tests.yml index c53c14218..9cc021b75 100644 --- a/.github/workflows/monitoring-tests.yml +++ b/.github/workflows/monitoring-tests.yml @@ -19,9 +19,9 @@ jobs: run: working-directory: ingestion/monitoring steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/prune-deploy.yml b/.github/workflows/prune-deploy.yml index 768ca8f70..744611e2b 100644 --- a/.github/workflows/prune-deploy.yml +++ b/.github/workflows/prune-deploy.yml @@ -13,7 +13,7 @@ jobs: deploy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: diff --git a/.github/workflows/prune-uploads-tests.yml b/.github/workflows/prune-uploads-tests.yml index 0c19862f5..08824c591 100644 --- a/.github/workflows/prune-uploads-tests.yml +++ b/.github/workflows/prune-uploads-tests.yml @@ -21,9 +21,9 @@ jobs: run: working-directory: data-serving/scripts/prune-uploads steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/r-package.yml b/.github/workflows/r-package.yml index c1d13e2b6..9f2748c24 100644 --- a/.github/workflows/r-package.yml +++ b/.github/workflows/r-package.yml @@ -18,7 +18,7 @@ jobs: run: working-directory: api/R steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: r-lib/actions/setup-r@v2 with: r-version: '4.1' diff --git a/.github/workflows/reusable-data-service-ci.yml b/.github/workflows/reusable-data-service-ci.yml index a2ce0eeeb..81e7f96c0 100644 --- a/.github/workflows/reusable-data-service-ci.yml +++ b/.github/workflows/reusable-data-service-ci.yml @@ -19,9 +19,9 @@ jobs: run: working-directory: data-serving/reusable-data-service steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.10 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.10.5' - name: Lint with flake8 diff --git a/.github/workflows/suggest-python.yml b/.github/workflows/suggest-python.yml index c7d560c11..105fd6969 100644 --- a/.github/workflows/suggest-python.yml +++ b/.github/workflows/suggest-python.yml @@ -19,9 +19,9 @@ jobs: run: working-directory: suggest/acronyms steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.8 - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: 3.8 - name: Install dependencies diff --git a/.github/workflows/update-dev-curator-db-schema.yml b/.github/workflows/update-dev-curator-db-schema.yml index acb723465..f62a0dcb1 100644 --- a/.github/workflows/update-dev-curator-db-schema.yml +++ b/.github/workflows/update-dev-curator-db-schema.yml @@ -15,10 +15,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: "12.x" diff --git a/.github/workflows/update-prod-curator-db-schema.yml b/.github/workflows/update-prod-curator-db-schema.yml index d93c47d39..c4a5fe173 100644 --- a/.github/workflows/update-prod-curator-db-schema.yml +++ b/.github/workflows/update-prod-curator-db-schema.yml @@ -12,10 +12,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: "12.x" diff --git a/.github/workflows/update-qa-curator-db-schema.yml b/.github/workflows/update-qa-curator-db-schema.yml index cf210d1aa..16c00b69f 100644 --- a/.github/workflows/update-qa-curator-db-schema.yml +++ b/.github/workflows/update-qa-curator-db-schema.yml @@ -12,10 +12,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: "16.x"