From 34ae02b30086475f6f48f2b3733f07fada404f0f Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:05:48 +0200 Subject: [PATCH] [CI] Unbreak testing flow The images removed/are in the process of removing compose v1. This also pins to an actual version instead of always using latest. Seems like a smart thing to do. https://github.com/actions/runner-images/issues/9557 --- .github/prepare-docker-image/action.yml | 2 +- .github/workflows/checks.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/prepare-docker-image/action.yml b/.github/prepare-docker-image/action.yml index cdd7bf3e1..c7fa133e6 100644 --- a/.github/prepare-docker-image/action.yml +++ b/.github/prepare-docker-image/action.yml @@ -15,5 +15,5 @@ runs: tags: e621 - name: Set docker run command - run: echo "DOCKER_RUN=docker-compose run -e CI=true" >> "$GITHUB_ENV" + run: echo "DOCKER_RUN=docker compose run -e CI=true" >> "$GITHUB_ENV" shell: bash diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 1defb5aac..0893c2d16 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -13,7 +13,7 @@ permissions: jobs: docker-build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Set up Docker Buildx @@ -27,7 +27,7 @@ jobs: tags: e621 rubocop: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: docker-build steps: @@ -38,7 +38,7 @@ jobs: run: $DOCKER_RUN rubocop --format github tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: docker-build steps: