From a99e2c62e64e5d61fd99ef97b58657cde389a3b2 Mon Sep 17 00:00:00 2001 From: Michael Fitz-Payne Date: Fri, 13 Sep 2024 08:08:08 +1000 Subject: [PATCH] Revert "DEV: update runners to debian-12" Need to address rate limits from docker.io This reverts commit 6ba0dcdb0e578efee2cd4df10a30d362f3b447cd. --- .github/workflows/labeler.yml | 2 +- .github/workflows/licenses.yml | 2 +- .github/workflows/linting.yml | 2 +- .github/workflows/migration-tests.yml | 2 +- .github/workflows/release-notes.yml | 2 +- .github/workflows/stale-pr-closer.yml | 2 +- .github/workflows/tests.yml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index ccadfb89777..0b3e2515d7d 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -10,7 +10,7 @@ permissions: jobs: triage: if: github.actor != 'discourse-translator-bot' - runs-on: debian-12 + runs-on: ubuntu-latest steps: - uses: actions/labeler@v5 diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index 9e7a6384beb..e22f37c16e9 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -17,7 +17,7 @@ jobs: build: if: github.event_name == 'pull_request' || github.repository != 'discourse/discourse-private-mirror' name: run - runs-on: debian-12 + runs-on: ubuntu-latest container: discourse/discourse_test:slim timeout-minutes: 10 diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 13990395090..bf55d086f20 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -17,7 +17,7 @@ jobs: build: if: github.event_name == 'pull_request' || github.repository != 'discourse/discourse-private-mirror' name: run - runs-on: debian-12 + runs-on: ubuntu-latest container: discourse/discourse_test:slim timeout-minutes: 30 diff --git a/.github/workflows/migration-tests.yml b/.github/workflows/migration-tests.yml index f39602de7eb..188d154093f 100644 --- a/.github/workflows/migration-tests.yml +++ b/.github/workflows/migration-tests.yml @@ -24,7 +24,7 @@ jobs: tests: if: github.event_name == 'pull_request' || github.repository != 'discourse/discourse-private-mirror' name: Tests with Ruby ${{ matrix.ruby }} - runs-on: debian-12 + runs-on: 'ubuntu-latest' container: discourse/discourse_test:slim timeout-minutes: 20 diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 2d2fcf65a60..5d7148008cd 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -20,7 +20,7 @@ permissions: jobs: build: name: run - runs-on: debian-12 + runs-on: ubuntu-latest container: discourse/discourse_test:slim timeout-minutes: 10 env: diff --git a/.github/workflows/stale-pr-closer.yml b/.github/workflows/stale-pr-closer.yml index b0469f4f9ad..f5f0702c60e 100644 --- a/.github/workflows/stale-pr-closer.yml +++ b/.github/workflows/stale-pr-closer.yml @@ -9,7 +9,7 @@ permissions: jobs: stale: - runs-on: debian-12 + runs-on: ubuntu-latest steps: - uses: actions/stale@v9 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d1b9281e566..c920a99c8ee 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,7 +29,7 @@ jobs: build: if: github.event_name == 'pull_request' || github.repository != 'discourse/discourse-private-mirror' name: ${{ matrix.target }} ${{ matrix.build_type }} # Update fetch-job-id step if changing this - runs-on: debian-12 + runs-on: ${{ (matrix.build_type == 'annotations') && 'ubuntu-latest' || 'ubuntu-22.04-8core' }} container: discourse/discourse_test:slim${{ (matrix.build_type == 'frontend' || matrix.build_type == 'system') && '-browsers' || '' }} timeout-minutes: 20 @@ -358,7 +358,7 @@ jobs: core_frontend_tests: if: github.event_name == 'pull_request' || github.repository != 'discourse/discourse-private-mirror' name: core frontend (${{ matrix.browser }}) - runs-on: debian-12 + runs-on: ubuntu-22.04-8core container: image: discourse/discourse_test:slim-browsers options: --user discourse