Skip to content

Commit

Permalink
OXDEV-5817 Fix github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
TitaKoleva committed May 13, 2024
1 parent f104c7e commit ed5f781
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ install_module:

phpunit:
matrix:
testplan: '["~/defaults/module_phpunit_unit.yml","~/defaults/module_phpunit_integration.yml"]'
testplan: '["~/defaults/module_phpunit_unit.yaml","~/defaults/module_phpunit_integration.yaml"]'
load_shop: *install_module_prefix

codeception:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
type: string
required: true
description: 'URL/PATH of the testplan to run'
default: '~/defaults/7.1.x.yml,~/module-evat.yml'
default: '~/defaults/7.1.x.yaml,~/module-evat.yaml'

jobs:
build_testplan:
Expand All @@ -40,18 +40,18 @@ jobs:
# shellcheck disable=SC2088 # Tilde expansion happens in the workflow and not by bash
case '${{inputs.limit}}' in
"no") LIMIT='';;
"PHP8.1/MySQL5.7") LIMIT='~/defaults/php8.1_mysql5.7_only.yml,' ;;
"PHP8.1/MySQL8.0") LIMIT='~/defaults/php8.1_mysql8.0_only.yml,' ;;
"PHP8.2/MySQL5.7") LIMIT='~/defaults/php8.2_mysql5.7_only.yml,' ;;
"PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yml,' ;;
"PHP8.1/MySQL5.7") LIMIT='~/defaults/php8.1_mysql5.7_only.yaml,' ;;
"PHP8.1/MySQL8.0") LIMIT='~/defaults/php8.1_mysql8.0_only.yaml,' ;;
"PHP8.2/MySQL5.7") LIMIT='~/defaults/php8.2_mysql5.7_only.yaml,' ;;
"PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yaml,' ;;
*) echo "Illegal choice, fix the workflow"
exit 1
;;
esac
case '${{ inputs.scenario}}' in
"7.1.x")
# shellcheck disable=SC2088 # Tilde expansion happens in the workflow and not by bash
TESTPLAN="~/defaults/7.1.x.yml,${LIMIT}~/module-evat.yml"
TESTPLAN="~/defaults/7.1.x.yaml,${LIMIT}~/module-evat.yaml"
;;
"use custom testplan")
# shellcheck disable=SC2088 # Tilde expansion happens in the workflow and not by bash
Expand All @@ -66,7 +66,7 @@ jobs:
dispatch_stable:
needs: build_testplan
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yaml@v4
with:
testplan: ${{ needs.build_testplan.outputs.testplan }}
runs_on: "ubuntu-latest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:

jobs:
pull_module:
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yaml@v4
with:
testplan: '~/defaults/7.1.x.yml,~/module-evat.yml'
testplan: '~/defaults/7.1.x.yaml,~/module-evat.yaml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
Expand All @@ -33,6 +33,6 @@ jobs:
repo: module-workflows
github_user: ${{ secrets.CI_USER }}
github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }}
workflow_file_name: evat_workflow.yml
workflow_file_name: evat_workflow.yaml
ref: "b-7.1.x"
client_payload: "{\"php\": \"8.2\", \"mysql\": \"8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}"
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:

jobs:
push_module:
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yaml@v4
with:
testplan: '~/defaults/7.1.x.yml,~/module-evat.yml'
testplan: '~/defaults/7.1.x.yaml,~/module-evat.yaml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
Expand All @@ -33,6 +33,6 @@ jobs:
repo: module-workflows
github_user: ${{ secrets.CI_USER }}
github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }}
workflow_file_name: evat_workflow.yml
ref: "b-7.1.x"
workflow_file_name: evat_workflow.yaml
ref: "b-7.1.x-fix-action-lint-errors-OXDEV-8324"
client_payload: "{\"php\": \"8.2\", \"mysql\": \"8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}"
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:

jobs:
call_matrix:
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yaml@v4
with:
testplan: '~/defaults/7.1.x.yml,~/module-evat.yml'
testplan: '~/defaults/7.1.x.yaml,~/module-evat.yaml'
runs_on: '"ubuntu-latest"'
defaults: 'v4'
plan_folder: '.github/oxid-esales'
Expand All @@ -32,6 +32,6 @@ jobs:
repo: module-workflows
github_user: ${{ secrets.CI_USER }}
github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }}
workflow_file_name: evat_workflow.yml
workflow_file_name: evat_workflow.yaml
ref: "b-7.1.x"
client_payload: "{\"php\": \"8.2\", \"mysql\": \"8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}"

0 comments on commit ed5f781

Please sign in to comment.