Skip to content

Commit 8373bdd

Browse files
committed
OXDEV-8811 Update GHA to version 5
1 parent 39ba234 commit 8373bdd

4 files changed

Lines changed: 41 additions & 41 deletions

File tree

.github/oxid-esales/graphql-base.yaml

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@
66
install:
77
cache:
88
prepared_shop: false
9-
git:
10-
repository: '{{ $repo }}'
11-
ref: &ref '{{ .Github.RefName }}'
12-
shop_url: 'https://github.com/OXID-eSales/graphql-base-module.git'
13-
shop_ref: *ref
149
composer:
10+
root_url: ''
1511
transform: |
1612
{
1713
"require": {
18-
"oxid-esales/oxideshop-ce": "{{ .Data.global.composer.dev_ref }}",
19-
"oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}",
20-
"oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
21-
"oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}",
22-
"oxid-esales/developer-tools": "{{ .Data.global.composer.dev_ref }}"
14+
"oxid-esales/oxideshop-ce": "{{ .Data.install.composer.dev_ref }}",
15+
"oxid-esales/twig-component": "{{ .Data.install.composer.dev_ref }}",
16+
"oxid-esales/twig-admin-theme": "{{ .Data.install.composer.dev_ref }}",
17+
"oxid-esales/apex-theme": "{{ .Data.install.composer.dev_ref }}",
18+
"oxid-esales/developer-tools": "{{ .Data.install.composer.dev_ref }}"
2319
}
2420
}
2521
custom_script_container: |
@@ -34,44 +30,43 @@ install:
3430
vendor/bin/oe-console oe:module:activate "{{ $ids }}"
3531
vendor/bin/oe-console oe:theme:activate apex
3632
37-
install_shop_with_modules:
38-
composer:
39-
root_url: ''
40-
4133
runscript: &runscript
4234
matrix:
4335
script: |
4436
[
45-
"graphql_base:tests-unit",
46-
"graphql_base:tests-integration",
47-
"graphql_base:tests-codeception"
37+
"report:tests-unit",
38+
"report:tests-integration",
39+
"no_report:tests-codeception",
4840
]
49-
composer:
50-
early: true
51-
graphql_base:
41+
report:
42+
path: ''
43+
no_report:
5244
path: ''
45+
coverage_prefix: ''
5346

5447
runslim:
5548
<<: *runscript
5649
matrix:
5750
script: |
5851
[
59-
"graphql_base:phpcs",
60-
"graphql_base:phpstan",
61-
"graphql_base:phpmd"
52+
"report:phpstan-report",
53+
"no_report:phpmd",
54+
"no_report:phpcs",
6255
]
6356
6457
sonarcloud:
6558
matrix:
6659
testplan: '["-"]'
6760
strip_path: '/var/www/'
61+
organization: 'oxid-esales'
6862
project_key: 'OXID-eSales_graphql-base-module'
6963
project_name: '{{ $org}}/{{ $name }}'
70-
parameters: |
71-
-Dsonar.language=php \
72-
-Dsonar.scm.provider=git \
73-
-Dsonar.sources=src \
64+
target_branch: 'b-7.4.x'
65+
parameters: >
66+
-Dsonar.language=php
67+
-Dsonar.scm.provider=git
68+
-Dsonar.sources=src
7469
-Dsonar.tests=tests
7570
7671
finish:
77-
slack_title: '{{ print $name }} ({{ .Data.global.git.shop_ref }}) by {{ .Github.Actor }}'
72+
slack_title: '{{ print $name }} ({{ .Data.install.git.ref }}) by {{ .Github.Actor }}'

.github/workflows/dispatch_module.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ on:
1212
- 'PHP8.2/MariaDb11'
1313
- 'PHP8.3/MySQL5.7'
1414
- 'PHP8.3/MySQL8.0'
15+
- 'PHP8.3/MySQL8.4'
1516
- 'PHP8.3/MariaDb11'
1617
- 'PHP8.4/MySQL8.0'
18+
- 'PHP8.4/MySQL8.4'
1719
- 'PHP8.4/MariaDb11'
1820
default: 'PHP8.3/MySQL8.0'
1921
description: 'Limit to one PHP/MySQL combination'
@@ -36,8 +38,10 @@ jobs:
3638
"PHP8.2/MariaDb11") LIMIT='~/defaults/php8.2_mariadb11_only.yaml,' ;;
3739
"PHP8.3/MySQL5.7") LIMIT='~/defaults/php8.3_mysql5.7_only.yaml,' ;;
3840
"PHP8.3/MySQL8.0") LIMIT='~/defaults/php8.3_mysql8.0_only.yaml,' ;;
41+
"PHP8.3/MySQL8.4") LIMIT='~/defaults/php8.3_mysql8.4_only.yaml,' ;;
3942
"PHP8.3/MariaDb11") LIMIT='~/defaults/php8.3_mariadb11_only.yaml,' ;;
4043
"PHP8.4/MySQL8.0") LIMIT='~/defaults/php8.4_mysql8.0_only.yaml,' ;;
44+
"PHP8.4/MySQL8.4") LIMIT='~/defaults/php8.4_mysql8.4_only.yaml,' ;;
4145
"PHP8.4/MariaDb11") LIMIT='~/defaults/php8.4_mariadb11_only.yaml,' ;;
4246
*) echo "Illegal choice, fix the workflow"
4347
exit 1
@@ -49,18 +53,17 @@ jobs:
4953
5054
dispatch_stable:
5155
needs: build_testplan
52-
uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
56+
uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v5
5357
with:
5458
testplan: ${{ needs.build_testplan.outputs.testplan }}
5559
runs_on: '"ubuntu-latest"'
56-
defaults: 'v4'
60+
defaults: 'v5'
5761
plan_folder: '.github/oxid-esales'
5862
secrets:
5963
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
6064
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
6165
CACHE_ENDPOINT: ${{ secrets.CACHE_ENDPOINT }}
6266
CACHE_ACCESS_KEY: ${{ secrets.CACHE_ACCESS_KEY }}
6367
CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
64-
enterprise_github_token: ${{ secrets.enterprise_github_token }}
6568
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6669
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/schedule_module.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ on:
66

77
jobs:
88
call_matrix:
9-
uses: OXID-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
9+
uses: OXID-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v5
1010
with:
11-
testplan: '~/defaults/7.4.x.yaml,~/graphql-base.yaml'
11+
testplan: '~/defaults/7.4.x.yaml,~/defaults/scheduled.yaml,~/graphql-base.yaml,~/_custom.yaml'
1212
runs_on: '"ubuntu-latest"'
13-
defaults: 'v4'
13+
defaults: 'v5'
1414
plan_folder: '.github/oxid-esales'
15-
use_scheduled_slack_channel: true
15+
custom_testplan_yaml: |
16+
finish:
17+
slack_title: 'GraphQL Base Module Weekly ({{ .Github.EventName }}-{{ .Github.RefName }})'
1618
secrets:
1719
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
1820
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
1921
CACHE_ENDPOINT: ${{ secrets.CACHE_ENDPOINT }}
2022
CACHE_ACCESS_KEY: ${{ secrets.CACHE_ACCESS_KEY }}
2123
CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
22-
enterprise_github_token: ${{ secrets.enterprise_github_token }}
2324
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
2425
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
25-
SLACK_SCHEDULED_WEBHOOK_URL: ${{ secrets.SLACK_SCHEDULED_WEBHOOK_URL }}

.github/workflows/trigger.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ on:
66

77
jobs:
88
call_matrix:
9-
uses: OXID-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
9+
uses: OXID-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v5
1010
with:
11-
testplan: '~/defaults/7.4.x.yaml,~/defaults/php8.3_mysql8.0_only.yaml,~/graphql-base.yaml'
11+
testplan: '~/defaults/7.4.x.yaml,~/defaults/php8.3_mysql8.0_only.yaml,~/graphql-base.yaml,~/_custom.yaml'
1212
runs_on: '"ubuntu-latest"'
13-
defaults: 'v4'
13+
defaults: 'v5'
1414
plan_folder: '.github/oxid-esales'
15+
custom_testplan_yaml: |
16+
finish:
17+
slack_title: 'GraphQL Base Module ({{ .Github.EventName }}-{{ .Github.RefName }})'
1518
secrets:
1619
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
1720
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
1821
CACHE_ENDPOINT: ${{ secrets.CACHE_ENDPOINT }}
1922
CACHE_ACCESS_KEY: ${{ secrets.CACHE_ACCESS_KEY }}
2023
CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
21-
enterprise_github_token: ${{ secrets.enterprise_github_token }}
2224
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
2325
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

0 commit comments

Comments
 (0)