Skip to content

Commit

Permalink
B 7.0.x fix workflows (#945)
Browse files Browse the repository at this point in the history
* Add missing plan_folder
* Fix typo in slim
* Fix 7.0.x push slim matrix
  • Loading branch information
joernott authored Feb 29, 2024
1 parent 5c5ec23 commit be2f901
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/oxid-esales/codeception_acceptance_70x.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
codeception:
title: codeception_acceptance
suite: 'acceptance'
suite: 'acceptance,acceptanceAdmin'
additional_options: '--coverage-xml=/var/www/coverage_codeception_acceptance.xml'
logfile:
prefix: 'codeception'
Expand Down
4 changes: 4 additions & 0 deletions .github/oxid-esales/shop_ce_70x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,9 @@ phpcs_tests:
diff_only: false
filter: '^\./source/Internal/.*\.php$'

sonarcloud:
matrix:
testplan: '["-","~/sonarcloud_oxideshop_ce_internal.yml"]'

finish:
slack_title: 'Full matrix CE ({{ .Data.global.git.shop_ref }}) on {{ .Github.Repository }} by {{ .Github.Actor }}'
28 changes: 28 additions & 0 deletions .github/oxid-esales/slim_matrix_ce_70x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This config depends on the defaults.yml testplan
# Only diverging settings are defined here
phpunit:
additional_options: ''
coverage:
path: ''

codeception:
matrix:
testplan: '["~/codeception_acceptance_70x.yml","~/codeception_acceptanceSetup_70x.yml"]'
# Running on public runners, this should pose no problem
max_parallel: &codeception_max_parallel 4
coverage:
path: ''

runtest:
matrix:
testplan: 'skip'

sonarcloud:
matrix:
testplan: 'skip'

phpcs_tests:
skip: true

finish:
slack_title: 'Slim matrix CE ({{ .Data.global.git.shop_ref }}) on {{ .Github.Repository }} by {{ .Github.Actor }}'
1 change: 1 addition & 0 deletions .github/workflows/nightly_matrix_full_ce_70x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
testplan: '~/defaults/7.0.x.yml,~/defaults/scheduled.yml,~/shop_ce_70x.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly_matrix_full_ce_71x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
testplan: '~/defaults/7.1.x.yml,~/defaults/scheduled.yml,~/shop_ce.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly_matrix_full_ce_80x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
testplan: '~/shop_ce.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly_smarty_70x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
testplan: '~/defaults/7.0.x.yml,~/defaults/scheduled.yml,~/smarty_7.0.x.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/pull_matrix_full_ce_70x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ name: Auto trigger on PR to 7.0.x*

on:
pull_request:
types:
- opened
- reopened
- synchronize
branches:
- b-7.0.x
- 'b-7.0.x**'

jobs:
oxideshop_ce_pull_70x:
Expand All @@ -17,6 +13,7 @@ jobs:
testplan: '~/defaults/7.0.x.yml,~/shop_ce_70x.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/pull_matrix_full_ce_71x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ name: Auto trigger on PR to 7.1.x*

on:
pull_request:
types:
- opened
- reopened
- synchronize
branches:
- b-7.1.x
- 'b-7.1.x**'

jobs:
oxideshop_ce_pull_71x:
Expand All @@ -17,6 +13,7 @@ jobs:
testplan: '~/defaults/7.1.x.yml,~/full_matrix_ce.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/pull_matrix_full_ce_80x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ name: Auto trigger on PR to 8.0.x*

on:
pull_request:
types:
- opened
- reopened
- synchronize
branches:
- b-8.0.x
- 'b-8.0.x**'

jobs:
oxideshop_ce_pull:
Expand All @@ -17,6 +13,7 @@ jobs:
testplan: '~/full_matrix_ce.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/push_matrix_full_ce_80x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
testplan: '~/shop_ce.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/push_matrix_slim_ce_70x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ jobs:
oxideshop_ce_push_b70x:
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
with:
testplan: '~/defaults/7.0.x.yml,~/defaults/php8.1_mysql_57.only.yml,~/slim_matrix_ce.yml'
testplan: '~/defaults/7.0.x.yml,~/defaults/php8.1_mysql5.7_only.yml,~/slim_matrix_ce_70x.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/push_matrix_slim_ce_71x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ jobs:
oxideshop_ce_push_b71x:
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
with:
testplan: '~/defaults/7.1.x.yml,~/defaults/php8.2_mysql_57.only.yml,~/slim_matrix_ce.yml'
testplan: '~/defaults/7.1.x.yml,~/defaults/php8.2_mysql5.7_only.yml,~/slim_matrix_ce.yml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
secrets:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
Expand Down

0 comments on commit be2f901

Please sign in to comment.