0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00

Switched around CI machine allocation

- now the vast majority of our flaky tests are gone, we don't need the
  bigger machines
- however, browser tests seem to be a little slow, so we can try giving
  them more power than the defaults
- this should also help with resource contention when we have multiple
  jobs running at the same time, as we have double the numbers of
  runners on the free machines
This commit is contained in:
Daniel Lockyer 2023-03-17 15:45:43 +01:00 committed by Daniel Lockyer
parent 9d25c2a058
commit a6966913dd
2 changed files with 8 additions and 8 deletions

View file

@ -24,7 +24,7 @@ on:
jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: linux
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && !startsWith(github.head_ref, 'renovate/'))
environment: ${{ github.event.inputs.environment || 'browser-tests-local' }}
env:

View file

@ -15,7 +15,7 @@ concurrency:
cancel-in-progress: true
jobs:
lint:
runs-on: linux
runs-on: ubuntu-latest
if: github.event_name == 'push' || (github.event_name == 'pull_request' && !startsWith(github.head_ref, 'renovate/'))
name: Lint
steps:
@ -36,7 +36,7 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
admin-tests:
runs-on: linux
runs-on: ubuntu-latest
if: github.event_name == 'push' || (github.event_name == 'pull_request' && !startsWith(github.head_ref, 'renovate/'))
name: Admin - Chrome
env:
@ -71,7 +71,7 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
migrations:
runs-on: linux
runs-on: ubuntu-latest
defaults:
run:
working-directory: ghost/core
@ -135,7 +135,7 @@ jobs:
- run: yarn knex-migrator migrate --force
unit-tests:
runs-on: linux
runs-on: ubuntu-latest
if: github.event_name == 'push' || (github.event_name == 'pull_request' && !startsWith(github.head_ref, 'renovate/'))
strategy:
matrix:
@ -167,7 +167,7 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
database-tests:
runs-on: linux
runs-on: ubuntu-latest
defaults:
run:
working-directory: ghost/core
@ -278,7 +278,7 @@ jobs:
ghost-cli:
name: Ghost-CLI
if: github.event_name == 'push' || (github.event_name == 'pull_request' && !startsWith(github.head_ref, 'renovate/'))
runs-on: linux
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
@ -337,7 +337,7 @@ jobs:
coverage:
name: Coverage
needs: [unit-tests, admin-tests]
runs-on: linux
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Restore coverage