Skip to content

Commit 48d756b

Browse files
committed
Run failing task test in separate queue to improve speed
1 parent 3cbd18d commit 48d756b

File tree

2 files changed

+17
-25
lines changed

2 files changed

+17
-25
lines changed

.github/workflows/run-tests.yml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,22 @@ on:
77

88
jobs:
99
php-tests:
10-
runs-on: ${{ matrix.os }}
10+
runs-on: ubuntu-latest
1111

1212
strategy:
1313
matrix:
14-
php: [8.1, 8.0, 7.4]
15-
laravel: [9.*, 8.*, 7.*, 6.*]
16-
os: [ubuntu-latest]
17-
include:
18-
- laravel: 9.*
19-
testbench: 7.*
20-
- laravel: 8.*
21-
testbench: 6.*
22-
- laravel: 7.*
23-
testbench: 5.*
24-
- laravel: 6.*
25-
testbench: 4.*
26-
exclude:
27-
- laravel: 9.*
28-
php: 7.4
29-
- laravel: 6.*
30-
php: 8.1
31-
- laravel: 7.*
32-
php: 8.1
33-
34-
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
14+
payload:
15+
- { queue: 'github-actions-laravel9-php81', laravel: '9.*', php: '8.1', 'testbench': '7.*'}
16+
- { queue: 'github-actions-laravel9-php80', laravel: '9.*', php: '8.0', 'testbench': '7.*'}
17+
- { queue: 'github-actions-laravel8-php81', laravel: '8.*', php: '8.1', 'testbench': '6.*'}
18+
- { queue: 'github-actions-laravel8-php80', laravel: '8.*', php: '8.0', 'testbench': '6.*'}
19+
- { queue: 'github-actions-laravel8-php74', laravel: '8.*', php: '7.4', 'testbench': '6.*'}
20+
- { queue: 'github-actions-laravel7-php80', laravel: '7.*', php: '8.0', 'testbench': '5.*' }
21+
- { queue: 'github-actions-laravel7-php74', laravel: '7.*', php: '7.4', 'testbench': '5.*' }
22+
- { queue: 'github-actions-laravel6-php80', laravel: '6.*', php: '8.0', 'testbench': '4.*' }
23+
- { queue: 'github-actions-laravel6-php74', laravel: '6.*', php: '7.4', 'testbench': '4.*' }
24+
25+
name: PHP ${{ matrix.payload.php }} - Laravel ${{ matrix.payload.laravel }}
3526

3627
steps:
3728
- name: Checkout code
@@ -40,7 +31,7 @@ jobs:
4031
- name: Setup PHP
4132
uses: shivammathur/setup-php@v2
4233
with:
43-
php-version: ${{ matrix.php }}
34+
php-version: ${{ matrix.payload.php }}
4435
extensions: mbstring, dom, fileinfo
4536
coverage: none
4637

@@ -51,7 +42,7 @@ jobs:
5142
5243
- name: Install dependencies
5344
run: |
54-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
45+
composer require "laravel/framework:${{ matrix.payload.laravel }}" "orchestra/testbench:${{ matrix.payload.testbench }}" --no-interaction --no-update
5546
composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
5647
- name: Execute tests
5748
env:
@@ -66,6 +57,7 @@ jobs:
6657
CI_CLOUD_TASKS_LOCATION: ${{ secrets.CI_CLOUD_TASKS_LOCATION }}
6758
CI_CLOUD_TASKS_SERVICE_ACCOUNT_EMAIL: ${{ secrets.CI_CLOUD_TASKS_SERVICE_ACCOUNT_EMAIL }}
6859
CI_SERVICE_ACCOUNT_JSON_KEY: ${{ secrets.CI_SERVICE_ACCOUNT_JSON_KEY }}
60+
CI_CLOUD_TASKS_CUSTOM_QUEUE: ${{ matrix.payload.queue }}
6961
run: |
7062
echo $CI_SERVICE_ACCOUNT_JSON_KEY > tests/Support/gcloud-key-valid.json
7163
vendor/bin/phpunit

tests/CloudTasksApiTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function test_get_retry_until_timestamp()
165165
$this->client->queueName(
166166
env('CI_CLOUD_TASKS_PROJECT_ID'),
167167
env('CI_CLOUD_TASKS_LOCATION'),
168-
env('CI_CLOUD_TASKS_QUEUE')
168+
env('CI_CLOUD_TASKS_CUSTOM_QUEUE', env('CI_CLOUD_TASKS_QUEUE'))
169169
),
170170
$cloudTask,
171171
);

0 commit comments

Comments
 (0)