Update github-actions to 4.11.2 (#145)

* Disable the _rename.yaml for now * Copy mysql logs onto archive
OXID-eSales · May 10, 2024 · ff25885 · ff25885
1 parent 59fe558
commit ff25885
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.github/oxid-esales/defaults/_rename.yaml b/.github/oxid-esales/defaults/_rename.yaml
@@ -12,7 +12,7 @@ global:
     repository: '{{ with .Data.global.git.repository }}{{ . }}{{ else }}{{ len (slice (printf "%*s" (len .Data.global.git.shop_url) "") 4) |slice .Data.global.git.shop_url 19 }}{{ end -}}'
     ref: '{{ with .Data.global.git.ref }}{{ . }}{{ else }}{{ .Data.global.git.shop_ref }}{{ end -}}'
 
-# {{- if not .Data.install}}
+# {{- if not .Data.install }}This only shows up, if the install section has not been defined
 install:
   matrix: '{{ .Data.install_shop_with_modules.matrix }}'
   max_parallel: '{{ .Data.install_shop_with_modules.max_parallel }}'
@@ -64,4 +64,4 @@ install:
     files: '{{ .Data.install_shop_with_modules.output.files }}'
     # The configuration file name is dynamic, the matrix variables will be appended
     artifact_prefix: 'install'
-# {{end}}
+# {{end}}End of the install section
diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml
@@ -116,7 +116,7 @@ jobs:
           TESTPLAN=$(echo "${{ inputs.testplan }}"|sed -e 's|~|${{ inputs.plan_folder }}|g')
           # ToDo: Remove the ,${{ inputs.plan_folder }}/defaults/_rename.yaml when releasing v5
           DEFAULTS="${{ inputs.plan_folder }}/defaults/defaults_light.yaml"
-          echo "testplan=${DEFAULTS},${TESTPLAN},${{ inputs.plan_folder }}/defaults/_rename.yaml" >>"${GITHUB_OUTPUT}"
+          echo "testplan=${DEFAULTS},${TESTPLAN}" >>"${GITHUB_OUTPUT}"
 
       - name: 'Load Testplan'
         id: ltp

diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml
@@ -116,7 +116,7 @@ jobs:
           TESTPLAN=$(echo "${{ inputs.testplan }}"|sed -e 's|~|${{ inputs.plan_folder }}|g')
           # ToDo: Remove the ,${{ inputs.plan_folder }}/defaults/_rename.yaml when releasing v5
           DEFAULTS="${{ inputs.plan_folder }}/defaults/defaults_light.yaml"
-          echo "testplan=${DEFAULTS},${TESTPLAN},${{ inputs.plan_folder }}/defaults/_rename.yaml" >>"${GITHUB_OUTPUT}"
+          echo "testplan=${DEFAULTS},${TESTPLAN}" >>"${GITHUB_OUTPUT}"
 
       - name: 'Load Testplan'
         id: ltp

diff --git a/load_cached_testplan/action.yaml b/load_cached_testplan/action.yaml
@@ -99,7 +99,7 @@ runs:
         MATRIX_TESTPLAN=$(echo "${{ inputs.matrix_testplan }}"|sed -e 's|~|${{ inputs.plan_folder }}|g')
         # ToDo: Remove the ,${{ inputs.plan_folder }}/defaults/_rename.yaml when releasing v5
         if [[ '${{ inputs.matrix_testplan}}' == '-' || -z '${{ inputs.matrix_testplan}}' ]]; then
-          echo "testplan=${DEFAULT_TESTPLAN},${{ inputs.plan_folder }}/defaults/_rename.yaml" | tee -a "${GITHUB_OUTPUT}"
+          echo "testplan=${DEFAULT_TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
         else
           echo "testplan=${DEFAULT_TESTPLAN},${MATRIX_TESTPLAN},${{ inputs.plan_folder }}/defaults/_rename.yaml" | tee -a "${GITHUB_OUTPUT}"
         fi

diff --git a/run_test_script/action.yaml b/run_test_script/action.yaml
@@ -101,6 +101,8 @@ runs:
         fi
         touch data/php/logs/error_log.txt
         cp data/php/logs/error_log.txt source/${{ inputs.path }}/tests/Output/
+        cp data/mysql/mysql/slow_log* source/${{ inputs.path }}/tests/Output/
+        cp data/mysql/mysql/general_log.CSV source/${{ inputs.path }}/tests/Output/
 
     - name: Upload artifact
       if: always()