diff --git a/.github/oxid-esales/defaults/php8.1_mariadb10_only.yaml b/.github/oxid-esales/defaults/php8.1_mariadb10_only.yaml new file mode 100644 index 00000000..2bef2fb1 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_mariadb10_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1"]' + mysql: '["mariadb-10"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.1_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.1_mariadb11_only.yaml new file mode 100644 index 00000000..f08d2a0a --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1"]' + mysql: '["mariadb-11"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.1_mysql8_only.yaml b/.github/oxid-esales/defaults/php8.1_mysql8_only.yaml new file mode 100644 index 00000000..d9e9f396 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_mysql8_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1"]' + mysql: '["mysql-8"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.2_mariadb10_only.yaml b/.github/oxid-esales/defaults/php8.2_mariadb10_only.yaml new file mode 100644 index 00000000..e8c5c9e0 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.2_mariadb10_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.2"]' + mysql: '["mariadb-10"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.2_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.2_mariadb11_only.yaml new file mode 100644 index 00000000..e7b08aa0 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.2_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.2"]' + mysql: '["mariadb-11"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.2_mysql8_only.yaml b/.github/oxid-esales/defaults/php8.2_mysql8_only.yaml new file mode 100644 index 00000000..0f35009a --- /dev/null +++ b/.github/oxid-esales/defaults/php8.2_mysql8_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.2"]' + mysql: '["mysql-8"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.3_mariadb10_only.yaml b/.github/oxid-esales/defaults/php8.3_mariadb10_only.yaml new file mode 100644 index 00000000..ec49faa5 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.3_mariadb10_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.3"]' + mysql: '["mariadb-10"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.3_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.3_mariadb11_only.yaml new file mode 100644 index 00000000..0b11c338 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.3_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.3"]' + mysql: '["mariadb-11"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.3_mysql8_only.yaml b/.github/oxid-esales/defaults/php8.3_mysql8_only.yaml new file mode 100644 index 00000000..5dd18a91 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.3_mysql8_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.3"]' + mysql: '["mysql-8"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.4_mariadb10_only.yaml b/.github/oxid-esales/defaults/php8.4_mariadb10_only.yaml new file mode 100644 index 00000000..d7c6df79 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mariadb10_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["mariadb-10"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.4_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.4_mariadb11_only.yaml new file mode 100644 index 00000000..8d606432 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["mariadb-11"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.4_mysql8_only.yaml b/.github/oxid-esales/defaults/php8.4_mysql8_only.yaml new file mode 100644 index 00000000..31162c58 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mysql8_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["mysql-8"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/scheduled.yaml b/.github/oxid-esales/defaults/scheduled.yaml index a3ed13d9..597822a7 100644 --- a/.github/oxid-esales/defaults/scheduled.yaml +++ b/.github/oxid-esales/defaults/scheduled.yaml @@ -12,6 +12,10 @@ global: composer: &composer ref_name: 'dev-{{ .Data.global.git.default_ref }}' +init: + cache: + name: '{{ .Github.EventName }}-{{ .Data.global.git.default_ref }}-testplan-{{ .Env.GITHUB_REPOSITORY_ID }}-{{ .Github.SHA }}-{{ .Github.RunID }}' + install_shop_with_modules: &install git: *git composer: *composer diff --git a/.github/oxid-esales/defaults/scheduled.yml b/.github/oxid-esales/defaults/scheduled.yml index a3ed13d9..597822a7 100644 --- a/.github/oxid-esales/defaults/scheduled.yml +++ b/.github/oxid-esales/defaults/scheduled.yml @@ -12,6 +12,10 @@ global: composer: &composer ref_name: 'dev-{{ .Data.global.git.default_ref }}' +init: + cache: + name: '{{ .Github.EventName }}-{{ .Data.global.git.default_ref }}-testplan-{{ .Env.GITHUB_REPOSITORY_ID }}-{{ .Github.SHA }}-{{ .Github.RunID }}' + install_shop_with_modules: &install git: *git composer: *composer diff --git a/.github/oxid-esales/defaults/scripts/check_log.sh b/.github/oxid-esales/defaults/scripts/check_log.sh index 53341a74..ee03ebc2 100755 --- a/.github/oxid-esales/defaults/scripts/check_log.sh +++ b/.github/oxid-esales/defaults/scripts/check_log.sh @@ -30,7 +30,7 @@ fi [[ ${RESULT} -gt 0 ]] && exit 1 # shellcheck disable=SC2016 -sed -e 's|(.*)\r|$1|' -i "${PATTERN_FILE}" +sed -e 's|(.*)\r|$1|' -i.backup "${PATTERN_FILE}" while read -r LINE ; do if [ -n "${LINE}" ]; then if grep -q -E "${LINE}" "${LOG_FILE}"; then @@ -38,7 +38,7 @@ while read -r LINE ; do grep -E "${LINE}" "${LOG_FILE}" RESULT=1 else - echo -e "\033[0;32m Log dioes not contain matching pattern ${LINE}" + echo -e "\033[0;32m Log does not contain matching pattern ${LINE}" fi fi done <"${PATTERN_FILE}" diff --git a/.github/workflows/call-universal_test_workflow.yaml b/.github/workflows/call-universal_test_workflow.yaml index 4d506f4f..ed85c590 100644 --- a/.github/workflows/call-universal_test_workflow.yaml +++ b/.github/workflows/call-universal_test_workflow.yaml @@ -1592,6 +1592,15 @@ jobs: docker_token: ${{ secrets.DOCKER_HUB_TOKEN }} debug: ${{ needs.init.outputs.debug }} + - name: Update the github token + run: | + # Update github token + ${{ inputs.debug }} + docker compose exec -T \ + ${{ steps.styles_testplan.outputs.styles_container_options }} \ + ${{ steps.styles_testplan.outputs.styles_container_name }} \ + composer config -g github-oauth.github.com "${{ secrets.enterprise_github_token || github.token }}" + - name: 'Modify composer.json' if: ${{ steps.styles_testplan.outputs.styles_composer_transform != '' }} uses: 'OXID-eSales/github-actions/composer_merge@v4' diff --git a/.github/workflows/call-universal_test_workflow.yml b/.github/workflows/call-universal_test_workflow.yml index 4d506f4f..ed85c590 100644 --- a/.github/workflows/call-universal_test_workflow.yml +++ b/.github/workflows/call-universal_test_workflow.yml @@ -1592,6 +1592,15 @@ jobs: docker_token: ${{ secrets.DOCKER_HUB_TOKEN }} debug: ${{ needs.init.outputs.debug }} + - name: Update the github token + run: | + # Update github token + ${{ inputs.debug }} + docker compose exec -T \ + ${{ steps.styles_testplan.outputs.styles_container_options }} \ + ${{ steps.styles_testplan.outputs.styles_container_name }} \ + composer config -g github-oauth.github.com "${{ secrets.enterprise_github_token || github.token }}" + - name: 'Modify composer.json' if: ${{ steps.styles_testplan.outputs.styles_composer_transform != '' }} uses: 'OXID-eSales/github-actions/composer_merge@v4' diff --git a/.github/workflows/dispatch-release.yaml b/.github/workflows/dispatch-release.yaml index 0d14a33b..fc0d25c4 100644 --- a/.github/workflows/dispatch-release.yaml +++ b/.github/workflows/dispatch-release.yaml @@ -84,7 +84,7 @@ jobs: FILES=$(find . -iname '*.yml' -o -name "*.yaml") for FILE in ${FILES}; do sed -E 's|OXID-eSales/github-actions/(.*)@v([0-9][0-9]*)|OXID-eSales/github-actions/\1@v${{ inputs.major}}|g' \ - -i "${FILE}" + -i.backup "${FILE}" done STATUS=$(git status -s) if [ -n "${STATUS}" ]; then diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index b4ec0434..90058082 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -116,9 +116,9 @@ jobs: if [ '${{ github.event_name }}' == 'pull_request' ]; then REF=$(echo '{{ .Github.HeadRef }}'|sed -e 's|/refs/heads/||') # This is the git ref name - sed -e "s|safe_ref_name:.*|safe_ref_name: ${REF}|" -i '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' + sed -e "s|safe_ref_name:.*|safe_ref_name: ${REF}|" -i.backup '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' # This is the same for composer but with an added dev- prefix - sed -e "s|ref_name: dev-.*|ref_name: dev-${REF}|" -i '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' + sed -e "s|ref_name: dev-.*|ref_name: dev-${REF}|" -i.backup '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' fi TESTPLAN=$(echo "${{ inputs.testplan }}"|sed -e 's|~|${{ inputs.plan_folder }}|g') diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index b4ec0434..90058082 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -116,9 +116,9 @@ jobs: if [ '${{ github.event_name }}' == 'pull_request' ]; then REF=$(echo '{{ .Github.HeadRef }}'|sed -e 's|/refs/heads/||') # This is the git ref name - sed -e "s|safe_ref_name:.*|safe_ref_name: ${REF}|" -i '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' + sed -e "s|safe_ref_name:.*|safe_ref_name: ${REF}|" -i.backup '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' # This is the same for composer but with an added dev- prefix - sed -e "s|ref_name: dev-.*|ref_name: dev-${REF}|" -i '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' + sed -e "s|ref_name: dev-.*|ref_name: dev-${REF}|" -i.backup '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' fi TESTPLAN=$(echo "${{ inputs.testplan }}"|sed -e 's|~|${{ inputs.plan_folder }}|g') diff --git a/append_report/action.yaml b/append_report/action.yaml index 40cb0cc6..2b150d40 100644 --- a/append_report/action.yaml +++ b/append_report/action.yaml @@ -129,7 +129,7 @@ runs: rm debug/debug.sh fi if [ -n "${{ inputs.github_token }}" ]; then - sed -e 's|${{ inputs.github_token}}|${DEBUG_GH_TOKEN}|g' -i "${DEBUG_FILE}" + sed -e 's|${{ inputs.github_token}}|${DEBUG_GH_TOKEN}|g' -i.backup "${DEBUG_FILE}" fi cat >>"${DEBUG_FILE}" <failure_pattern.tmp <failure_pattern.tmp <failure_pattern.tmp <failure_pattern.tmp <failure_pattern.tmp <targets.tmp <failure_pattern.tmp <