Skip to content

Commit

Permalink
Merge branch 'main' into chore/update-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
JinIgarashi committed Oct 7, 2024
2 parents cf22c43 + 1eadd24 commit 326ef1b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/acr_docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Log into ACR
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ secrets.ACR_ENDPOINT }}
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}

- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ secrets.ACR_ENDPOINT }}/${{ env.IMAGE_NAME }}

- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
context: .
push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')}}
Expand All @@ -39,7 +39,7 @@ jobs:
# This job is going to trigger an event named `bump-pipeline-version`
# on undp-data/geohub repo in order to make a PR to bump version of data pipeline to AKS
- name: dispatch event to GeoHub repo to create release PR
uses: peter-evans/repository-dispatch@v1
uses: peter-evans/repository-dispatch@v3
if: startsWith(github.ref, 'refs/tags/v')
with:
repository: undp-data/geohub
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: "3.9"
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Build felt/tippecanoe
# Dockerfile from https://github.com/felt/tippecanoe/blob/main/Dockerfile
# add "--platform=linux/x86_64" for M1 Mac
FROM ubuntu:22.04 AS tippecanoe-builder
FROM ubuntu:24.04 AS tippecanoe-builder

RUN apt-get update \
&& apt-get -y install build-essential libsqlite3-dev zlib1g-dev git
Expand Down

0 comments on commit 326ef1b

Please sign in to comment.