diff --git a/.circleci/config.yml b/.circleci/config.yml index 8182a812f8..5709c34f52 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 executors: python3: docker: - - image: cimg/python:3.12.3 + - image: cimg/python:3.14.3 commands: ditto-transform: @@ -11,7 +11,7 @@ commands: 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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 80fc9578f8..55f3ce475a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: @@ -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 }}" @@ -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 diff --git a/.github/workflows/update-gql-v1beta-data.yml b/.github/workflows/update-gql-v1beta-data.yml index 48b0e008a9..8f5dc3d564 100644 --- a/.github/workflows/update-gql-v1beta-data.yml +++ b/.github/workflows/update-gql-v1beta-data.yml @@ -6,7 +6,7 @@ on: # - master jobs: update-gql-v1beta-data: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 concurrency: group: serial cancel-in-progress: false @@ -14,16 +14,16 @@ jobs: 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} \ @@ -31,8 +31,8 @@ jobs: --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' diff --git a/.github/workflows/update-gql-v1beta2-data.yml b/.github/workflows/update-gql-v1beta2-data.yml index ef6285343a..c85a41f1b0 100644 --- a/.github/workflows/update-gql-v1beta2-data.yml +++ b/.github/workflows/update-gql-v1beta2-data.yml @@ -6,7 +6,7 @@ on: - master jobs: update-gql-v1beta2-data: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 concurrency: group: serial cancel-in-progress: false @@ -14,8 +14,8 @@ jobs: 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 diff --git a/updater/Dockerfile b/updater/Dockerfile index a943de126c..1ab567c6bb 100644 --- a/updater/Dockerfile +++ b/updater/Dockerfile @@ -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 diff --git a/updater/cmd.bash b/updater/cmd.bash index 3aedb0f4f5..cdd7afe926 100644 --- a/updater/cmd.bash +++ b/updater/cmd.bash @@ -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