Drop stable branches, update to latest actions

.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/**'
@@ -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

.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:

.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

.github/workflows/completeness.yml

@@ -11,15 +11,15 @@ 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:
  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
  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

.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/**"
@@ -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

.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/**"
@@ -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

.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/**"
@@ -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

.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/**"
@@ -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

.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/**"
@@ -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

.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:

.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

.github/workflows/freshness.yml

@@ -11,15 +11,15 @@ 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:
  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
  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

.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/**"
@@ -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

.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/**'
@@ -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

.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/**'
@@ -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:
@@ -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

.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/**'
@@ -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:
@@ -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