Update github-actions to 4.12.1 (#148)

* Fix rename not loading and sdk deprecation warning * Remove duplicate copy/paste * Fix diverging yaml
OXID-eSales · May 23, 2024 · 5612503 · 5612503
1 parent 3edd13b
commit 5612503
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git a/.github/oxid-esales/defaults/defaults_light.yaml b/.github/oxid-esales/defaults/defaults_light.yaml
@@ -72,7 +72,10 @@ global:
   # Repository related settings
   git: &git
     # URL for the docker-eshop sdk repository to clone
+    # Deprecated, remove in v5
     sdk_url: &git_sdk_url 'https://github.com/OXID-eSales/docker-eshop-sdk.git'
+    # Name of the repository containing the oxideshop sdk
+    sdk_repository: &git_sdk_repository 'OXID-eSales/docker-eshop-sdk'
 
     # Branch to check out for the SDK
     sdk_ref: &git_sdk_ref 'master'

diff --git a/.github/oxid-esales/defaults/defaults_light.yml b/.github/oxid-esales/defaults/defaults_light.yml
@@ -72,7 +72,10 @@ global:
   # Repository related settings
   git: &git
     # URL for the docker-eshop sdk repository to clone
+    # Deprecated, remove in v5
     sdk_url: &git_sdk_url 'https://github.com/OXID-eSales/docker-eshop-sdk.git'
+    # Name of the repository containing the oxideshop sdk
+    sdk_repository: &git_sdk_repository 'OXID-eSales/docker-eshop-sdk'
 
     # Branch to check out for the SDK
     sdk_ref: &git_sdk_ref 'master'

diff --git a/.github/workflows/call-universal_test_workflow.yaml b/.github/workflows/call-universal_test_workflow.yaml
@@ -420,7 +420,7 @@ jobs:
             echo "${{ needs.init.outputs.install_shop_output_files }}" | sed -E 's/,|\s/\n/g'
             echo EOF
           } >> "${GITHUB_ENV}"
-    
+
       - name: Upload configuration artifacts
         if: always()
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/call-universal_test_workflow.yml b/.github/workflows/call-universal_test_workflow.yml
@@ -420,7 +420,7 @@ jobs:
             echo "${{ needs.init.outputs.install_shop_output_files }}" | sed -E 's/,|\s/\n/g'
             echo EOF
           } >> "${GITHUB_ENV}"
-    
+
       - name: Upload configuration artifacts
         if: always()
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml
@@ -458,7 +458,7 @@ jobs:
           name: '${{ steps.iltp.outputs.install_output_artifact_prefix }}-${{steps.itn.outputs.matrix_suffix}}'
           path: |-
             ${{ env.ARTIFACT_PATHS }}
-          
+
       - name: Run custom scripts
         # yamllint disable-line rule:line-length
         if: ${{ steps.iltp.outputs.install_custom_script != '' || steps.iltp.outputs.install_custom_script_container != '' }}

diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml
@@ -458,7 +458,7 @@ jobs:
           name: '${{ steps.iltp.outputs.install_output_artifact_prefix }}-${{steps.itn.outputs.matrix_suffix}}'
           path: |-
             ${{ env.ARTIFACT_PATHS }}
-          
+
       - name: Run custom scripts
         # yamllint disable-line rule:line-length
         if: ${{ steps.iltp.outputs.install_custom_script != '' || steps.iltp.outputs.install_custom_script_container != '' }}

diff --git a/load_cached_testplan/action.yaml b/load_cached_testplan/action.yaml
@@ -101,6 +101,6 @@ runs:
         if [[ '${{ inputs.matrix_testplan}}' == '-' || -z '${{ inputs.matrix_testplan}}' ]]; then
           echo "testplan=${DEFAULT_TESTPLAN},${{ inputs.plan_folder }}/defaults/_rename.yaml" | tee -a "${GITHUB_OUTPUT}"
         else
-          echo "testplan=${DEFAULT_TESTPLAN},${MATRIX_TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
+          echo "testplan=${DEFAULT_TESTPLAN},${MATRIX_TESTPLAN},${{ inputs.plan_folder }}/defaults/_rename.yaml" | tee -a "${GITHUB_OUTPUT}"
         fi
         echo "matrix_suffix=${{inputs.prefix}}-PHP${{inputs.php}}-MYSQL${{inputs.mysql}}" | tee -a "${GITHUB_OUTPUT}"