Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ version: 2.1
executors:
python3:
docker:
- image: cimg/python:3.12.3
- image: cimg/python:3.14.3

commands:
ditto-transform:
description: Run Ditto in order to transform the BASE_URL instead of http://localhost
steps:
- run:
name: Install Ditto
command: pip install --user 'pokeapi-ditto==1.0.3'
command: pip install --user 'pokeapi-ditto==1.0.4'
- run:
name: Transform api-data's JSON files to have the correct BASE_URL instead of http://localhost
command: bash -x scripts/transform.sh
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Run and test
run: (cd updater && bash cmd.bash)
env:
Expand All @@ -25,17 +25,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: pokeapi/updater
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
- name: Inspect builder
run: |
echo "Name: ${{ steps.buildx.outputs.name }}"
Expand All @@ -45,7 +45,7 @@ jobs:
echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
- name: Build
id: docker_build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
context: ./updater
load: true
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/update-gql-v1beta-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@ on:
# - master
jobs:
update-gql-v1beta-data:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
concurrency:
group: serial
cancel-in-progress: false
permissions:
contents: 'read'
id-token: 'write'
steps:
- uses: 'actions/checkout@v4'
- uses: 'google-github-actions/auth@v2'
- uses: actions/checkout@v6
- uses: google-github-actions/auth@v3
with:
project_id: 'pokeapi-215911'
workload_identity_provider: 'projects/569595515170/locations/global/workloadIdentityPools/github/providers/deploy'
- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v2'
- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@v3
with:
version: '>= 390.0.0'
- name: 'Make snapshot'
- name: Make snapshot
run: |
gcloud compute snapshots create gql-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT} \
--labels=trigger=gql-data-update,next-head-ref=${GITHUB_SHA} \
--snapshot-type=ARCHIVE \
--source-disk=graphql5 \
--source-disk-zone=us-east1-b \
--storage-location=us-east1
- name: 'Update data'
uses: 'google-github-actions/ssh-compute@v1'
- name: Update data
uses: google-github-actions/ssh-compute@v2
with:
instance_name: 'graphql5'
zone: 'us-east1-b'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update-gql-v1beta2-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ on:
- master
jobs:
update-gql-v1beta2-data:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
concurrency:
group: serial
cancel-in-progress: false
permissions:
contents: 'read'
id-token: 'write'
steps:
- uses: 'actions/checkout@v4'
- uses: 'actions/checkout@v6'

- name: 'Update data'
run: |-
echo "$GCP_STAGING_GRAPHQL1_VM_SSH_PRIVATE_KEY" > pk.key
Expand Down
2 changes: 1 addition & 1 deletion updater/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker:24.0.7-dind-alpine3.18
FROM docker:29.3.0-dind-alpine3.23

RUN apk update
RUN apk add curl python3 git bash build-base python3-dev py3-pip
Expand Down
2 changes: 1 addition & 1 deletion updater/cmd.bash
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ git branch "$BRANCH_NAME"
git checkout "$BRANCH_NAME"
python -m venv .venv
source .venv/bin/activate
pip install 'pokeapi-ditto==1.0.3'
pip install 'pokeapi-ditto==1.0.4'
rm -rf ./data
ditto clone --src-url http://localhost/ --dest-dir ./data
# (╯°□°)╯ *always* assume magikarp failed and grab it again #clowntown
Expand Down