From 0897f78aaf9a11e6b5ea4fea1c1b5156afb33682 Mon Sep 17 00:00:00 2001 From: Lev Kokotov Date: Thu, 4 Sep 2025 14:13:16 -0700 Subject: [PATCH 1/2] Switch back to gh runners --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/package.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04e1a0cc..e71aaebc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: jobs: fmt: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 @@ -23,7 +23,7 @@ jobs: working-directory: pgdog run: cargo clippy build: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 @@ -41,7 +41,7 @@ jobs: - name: Check release run: cargo check --release tests: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 @@ -71,7 +71,7 @@ jobs: - name: Run documentation tests run: cargo test --doc integration: - runs-on: blacksmith-8vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 1af91b3d..3dd29486 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -17,7 +17,7 @@ jobs: matrix: include: - platform: linux/amd64 - runner: blacksmith-4vcpu-ubuntu-2404 + runner: ubuntu-24.04 - platform: linux/arm64 runner: ubuntu-24.04-arm permissions: From b5de018ea6abdc2a9d33121aec156bdf293d0b55 Mon Sep 17 00:00:00 2001 From: Lev Kokotov Date: Thu, 4 Sep 2025 14:16:13 -0700 Subject: [PATCH 2/2] fix cache --- .github/workflows/ci.yml | 4 ++-- .github/workflows/package.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e71aaebc..41a65f82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: with: toolchain: stable override: true - - uses: useblacksmith/rust-cache@v3 + - uses: Swatinem/rust-cache@v2 with: prefix-key: "v1" # Change this when updating tooling - name: Setup PostgreSQL @@ -78,7 +78,7 @@ jobs: with: toolchain: stable override: true - - uses: useblacksmith/rust-cache@v3 + - uses: Swatinem/rust-cache@v2 with: prefix-key: release-1 - name: Setup dependencies diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 3dd29486..a868a068 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -85,7 +85,7 @@ jobs: push-to-registry: true merge: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 needs: - build permissions: