From b3beada6b6e3b4ab775944df0052c6769d9a34b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:59:10 +0000
Subject: [PATCH 1/5] Bump raven-actions/actionlint from 1 to 2

Bumps [raven-actions/actionlint](https://github.com/raven-actions/actionlint) from 1 to 2.
- [Release notes](https://github.com/raven-actions/actionlint/releases)
- [Commits](https://github.com/raven-actions/actionlint/compare/v1...v2)

---
updated-dependencies:
- dependency-name: raven-actions/actionlint
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/call-universal_test_workflow.yaml | 2 +-
 .github/workflows/call-universal_test_workflow.yml  | 2 +-
 .github/workflows/push-validate_workflows.yaml      | 2 +-
 .github/workflows/universal_workflow_light.yaml     | 2 +-
 .github/workflows/universal_workflow_light.yml      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/call-universal_test_workflow.yaml b/.github/workflows/call-universal_test_workflow.yaml
index 4b8f525b..44ff7791 100644
--- a/.github/workflows/call-universal_test_workflow.yaml
+++ b/.github/workflows/call-universal_test_workflow.yaml
@@ -1705,7 +1705,7 @@ jobs:
 
       - name: Run actionlint
         id: actionlint
-        uses: raven-actions/actionlint@v1
+        uses: raven-actions/actionlint@v2
 
       - name: actionlint Summary
         if: always()
diff --git a/.github/workflows/call-universal_test_workflow.yml b/.github/workflows/call-universal_test_workflow.yml
index 4b8f525b..44ff7791 100644
--- a/.github/workflows/call-universal_test_workflow.yml
+++ b/.github/workflows/call-universal_test_workflow.yml
@@ -1705,7 +1705,7 @@ jobs:
 
       - name: Run actionlint
         id: actionlint
-        uses: raven-actions/actionlint@v1
+        uses: raven-actions/actionlint@v2
 
       - name: actionlint Summary
         if: always()
diff --git a/.github/workflows/push-validate_workflows.yaml b/.github/workflows/push-validate_workflows.yaml
index 62af03cf..39be1743 100644
--- a/.github/workflows/push-validate_workflows.yaml
+++ b/.github/workflows/push-validate_workflows.yaml
@@ -80,7 +80,7 @@ jobs:
 
       - name: Run actionlint
         id: actionlint
-        uses: raven-actions/actionlint@v1
+        uses: raven-actions/actionlint@v2
 
       - name: actionlint Summary
         if: always()
diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml
index f0dd7847..66f64eac 100644
--- a/.github/workflows/universal_workflow_light.yaml
+++ b/.github/workflows/universal_workflow_light.yaml
@@ -1231,7 +1231,7 @@ jobs:
 
       - name: Run actionlint
         id: actionlint
-        uses: raven-actions/actionlint@v1
+        uses: raven-actions/actionlint@v2
 
       - name: actionlint Summary
         if: always()
diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml
index f0dd7847..66f64eac 100644
--- a/.github/workflows/universal_workflow_light.yml
+++ b/.github/workflows/universal_workflow_light.yml
@@ -1231,7 +1231,7 @@ jobs:
 
       - name: Run actionlint
         id: actionlint
-        uses: raven-actions/actionlint@v1
+        uses: raven-actions/actionlint@v2
 
       - name: actionlint Summary
         if: always()

From 9d4b3b1890a38af86f4e093cf2e7473a93f2d8fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Ott?= <joern.ott@ott-consult.de>
Date: Thu, 18 Jul 2024 09:41:28 +0200
Subject: [PATCH 2/5] Improve token handling in debug script

---
 .../workflows/universal_workflow_light.yaml   | 23 ++++++++++++-------
 append_report/action.yaml                     |  8 +++++++
 begin_report/action.yaml                      |  3 +++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml
index 66f64eac..d35e0e42 100644
--- a/.github/workflows/universal_workflow_light.yaml
+++ b/.github/workflows/universal_workflow_light.yaml
@@ -212,7 +212,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ steps.post_ltp.outputs.title }}'
           header: true
@@ -220,6 +220,7 @@ jobs:
           priority: '001'
           cached_object: ${{ steps.ltp.outputs.init_cache_name }}
           debug: false
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
     outputs:
       debug: ${{ steps.begin_report.outputs.debug }}
@@ -694,7 +695,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '020'
@@ -709,6 +710,7 @@ jobs:
             ${{ steps.iltp.outputs.install_cache_prefix}}_${{steps.iltp.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}
           # yamllint enable rule:line-length
           debug: ${{ inputs.debug }}
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   runscript:
     needs: ['init', 'install']
@@ -753,7 +755,7 @@ jobs:
           yaml: generated_testplan.yaml
           loglevel: info
           logfile: load_testplan_runscript.log
-          token: ${{ secrets.enterprise_github_token }}
+          token: ${{ secrets.enterprise_github_token || github.token }}
 
       - name: Convert variables
         id: rt
@@ -888,7 +890,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '100'
@@ -899,6 +901,7 @@ jobs:
           mysql: ${{matrix.mysql}}
           status: ${{job.status}}
           debug: ${{ inputs.debug }}
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   runslim:
     needs: ['init', 'install']
@@ -1071,7 +1074,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '100'
@@ -1082,6 +1085,7 @@ jobs:
           mysql: ${{matrix.mysql}}
           status: ${{job.status}}
           debug: ${{ inputs.debug }}
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   sonarcloud:
     needs: ['init', 'install', 'runscript', 'runslim']
@@ -1165,7 +1169,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '240'
@@ -1177,6 +1181,7 @@ jobs:
           testplan: ${{matrix.testplan}}
           status: ${{job.status}}
           debug: ${{ inputs.debug }}
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   yamllint:
     needs: ['init', 'install']
@@ -1197,7 +1202,7 @@ jobs:
 
       - name: 'Write yamllint Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '240'
@@ -1209,6 +1214,7 @@ jobs:
           testplan: ''
           status: ${{job.status}}
           debug: false
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   actionlint:
     needs: ['init', 'install']
@@ -1246,7 +1252,7 @@ jobs:
 
       - name: 'Write actionlint Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '250'
@@ -1258,6 +1264,7 @@ jobs:
           testplan: ''
           status: ${{job.status}}
           debug: false
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   finish:
     if: ${{ always() && needs.init.outputs.finish_skip != 'true' }}
diff --git a/append_report/action.yaml b/append_report/action.yaml
index 540c0ae7..40cb0cc6 100644
--- a/append_report/action.yaml
+++ b/append_report/action.yaml
@@ -59,6 +59,11 @@ inputs:
     description: 'Enable debugging'
     default: false
     required: false
+  github_token:
+    type: string
+    required: false
+    description: 'Github token to be replaced by a variable in the debug script'
+    default: ''
 
 runs:
   using: "composite"
@@ -123,6 +128,9 @@ runs:
           sed -e 's/^/  /' debug/debug.sh >>"${DEBUG_FILE}"
           rm debug/debug.sh
         fi
+        if [ -n "${{ inputs.github_token }}" ]; then
+          sed -e 's|${{ inputs.github_token}}|${DEBUG_GH_TOKEN}|g' -i "${DEBUG_FILE}"
+        fi
         cat >>"${DEBUG_FILE}" <<EODS
           end_job "$DEBUG_NAME"
         }
diff --git a/begin_report/action.yaml b/begin_report/action.yaml
index e3bcc4ed..12f0c485 100644
--- a/begin_report/action.yaml
+++ b/begin_report/action.yaml
@@ -73,6 +73,9 @@ runs:
         #!/bin/bash
         set -e
         set -x
+        # Set this to your github token or export this variable before
+        # running the script
+        # DEBUG_GH_TOKEN='<put your own token here>'
 
         function banner() {
           PURPLE=$(echo -e "\033[0;35m")

From 1d57fcb13600c164dbd899340cc5db816210da80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Ott?= <joern.ott@ott-consult.de>
Date: Thu, 18 Jul 2024 11:03:25 +0200
Subject: [PATCH 3/5] Fix transform handling on skip

---
 .github/workflows/universal_workflow_light.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml
index d35e0e42..bafdff20 100644
--- a/.github/workflows/universal_workflow_light.yaml
+++ b/.github/workflows/universal_workflow_light.yaml
@@ -820,7 +820,8 @@ jobs:
           debug: ${{ needs.init.outputs.debug }}
 
       - name: 'Modify composer.json'
-        if: ${{ steps.rt.outputs.runscript_composer_transform != '' && steps.rt.outputs.runscript_composer_early == 'false' }}
+        # Also run this if there is a transformation but composer_early is set to 'skip'
+        if: ${{ steps.rt.outputs.runscript_composer_transform != '' && steps.rt.outputs.runscript_composer_early != 'true' }}
         uses: 'OXID-eSales/github-actions/composer_merge@v4'
         with:
           file: 'source/${{ steps.rt.outputs.runscript_path }}/composer.json'
@@ -836,6 +837,7 @@ jobs:
           github_token: ${{ secrets.enterprise_github_token || github.token }}
 
       - name: Run composer if there is no transform
+        # Only run this if there is no transformation and composer_early is set to 'false'
         if: ${{ steps.rt.outputs.runscript_composer_transform == '' && steps.rt.outputs.runscript_composer_early == 'false' }}
         run: |
           # run composer

From ad6eaa993450cdeb034e7d196af50a699128857b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Ott?= <joern.ott@ott-consult.de>
Date: Fri, 19 Jul 2024 10:28:04 +0200
Subject: [PATCH 4/5] lint

---
 .../workflows/universal_workflow_light.yml    | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml
index 66f64eac..bafdff20 100644
--- a/.github/workflows/universal_workflow_light.yml
+++ b/.github/workflows/universal_workflow_light.yml
@@ -212,7 +212,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ steps.post_ltp.outputs.title }}'
           header: true
@@ -220,6 +220,7 @@ jobs:
           priority: '001'
           cached_object: ${{ steps.ltp.outputs.init_cache_name }}
           debug: false
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
     outputs:
       debug: ${{ steps.begin_report.outputs.debug }}
@@ -694,7 +695,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '020'
@@ -709,6 +710,7 @@ jobs:
             ${{ steps.iltp.outputs.install_cache_prefix}}_${{steps.iltp.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}
           # yamllint enable rule:line-length
           debug: ${{ inputs.debug }}
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   runscript:
     needs: ['init', 'install']
@@ -753,7 +755,7 @@ jobs:
           yaml: generated_testplan.yaml
           loglevel: info
           logfile: load_testplan_runscript.log
-          token: ${{ secrets.enterprise_github_token }}
+          token: ${{ secrets.enterprise_github_token || github.token }}
 
       - name: Convert variables
         id: rt
@@ -818,7 +820,8 @@ jobs:
           debug: ${{ needs.init.outputs.debug }}
 
       - name: 'Modify composer.json'
-        if: ${{ steps.rt.outputs.runscript_composer_transform != '' && steps.rt.outputs.runscript_composer_early == 'false' }}
+        # Also run this if there is a transformation but composer_early is set to 'skip'
+        if: ${{ steps.rt.outputs.runscript_composer_transform != '' && steps.rt.outputs.runscript_composer_early != 'true' }}
         uses: 'OXID-eSales/github-actions/composer_merge@v4'
         with:
           file: 'source/${{ steps.rt.outputs.runscript_path }}/composer.json'
@@ -834,6 +837,7 @@ jobs:
           github_token: ${{ secrets.enterprise_github_token || github.token }}
 
       - name: Run composer if there is no transform
+        # Only run this if there is no transformation and composer_early is set to 'false'
         if: ${{ steps.rt.outputs.runscript_composer_transform == '' && steps.rt.outputs.runscript_composer_early == 'false' }}
         run: |
           # run composer
@@ -888,7 +892,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '100'
@@ -899,6 +903,7 @@ jobs:
           mysql: ${{matrix.mysql}}
           status: ${{job.status}}
           debug: ${{ inputs.debug }}
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   runslim:
     needs: ['init', 'install']
@@ -1071,7 +1076,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '100'
@@ -1082,6 +1087,7 @@ jobs:
           mysql: ${{matrix.mysql}}
           status: ${{job.status}}
           debug: ${{ inputs.debug }}
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   sonarcloud:
     needs: ['init', 'install', 'runscript', 'runslim']
@@ -1165,7 +1171,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '240'
@@ -1177,6 +1183,7 @@ jobs:
           testplan: ${{matrix.testplan}}
           status: ${{job.status}}
           debug: ${{ inputs.debug }}
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   yamllint:
     needs: ['init', 'install']
@@ -1197,7 +1204,7 @@ jobs:
 
       - name: 'Write yamllint Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '240'
@@ -1209,6 +1216,7 @@ jobs:
           testplan: ''
           status: ${{job.status}}
           debug: false
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   actionlint:
     needs: ['init', 'install']
@@ -1246,7 +1254,7 @@ jobs:
 
       - name: 'Write actionlint Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v4
+        uses: OXID-eSales/github-actions/append_report@v0
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '250'
@@ -1258,6 +1266,7 @@ jobs:
           testplan: ''
           status: ${{job.status}}
           debug: false
+          github_token: ${{ secrets.enterprise_github_token || github.token }}
 
   finish:
     if: ${{ always() && needs.init.outputs.finish_skip != 'true' }}

From 8029a0f3500650c20a029425aecb397a0d5636fd Mon Sep 17 00:00:00 2001
From: joernott <no-reply@oxid-esales.com>
Date: Fri, 19 Jul 2024 08:35:02 +0000
Subject: [PATCH 5/5] Update versions

---
 .github/workflows/universal_workflow_light.yaml | 14 +++++++-------
 .github/workflows/universal_workflow_light.yml  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml
index bafdff20..7beef909 100644
--- a/.github/workflows/universal_workflow_light.yaml
+++ b/.github/workflows/universal_workflow_light.yaml
@@ -212,7 +212,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ steps.post_ltp.outputs.title }}'
           header: true
@@ -695,7 +695,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '020'
@@ -892,7 +892,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '100'
@@ -1076,7 +1076,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '100'
@@ -1171,7 +1171,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '240'
@@ -1204,7 +1204,7 @@ jobs:
 
       - name: 'Write yamllint Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '240'
@@ -1254,7 +1254,7 @@ jobs:
 
       - name: 'Write actionlint Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '250'
diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml
index bafdff20..7beef909 100644
--- a/.github/workflows/universal_workflow_light.yml
+++ b/.github/workflows/universal_workflow_light.yml
@@ -212,7 +212,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ steps.post_ltp.outputs.title }}'
           header: true
@@ -695,7 +695,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '020'
@@ -892,7 +892,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '100'
@@ -1076,7 +1076,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '100'
@@ -1171,7 +1171,7 @@ jobs:
 
       - name: 'Write Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '240'
@@ -1204,7 +1204,7 @@ jobs:
 
       - name: 'Write yamllint Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '240'
@@ -1254,7 +1254,7 @@ jobs:
 
       - name: 'Write actionlint Report'
         if: always()
-        uses: OXID-eSales/github-actions/append_report@v0
+        uses: OXID-eSales/github-actions/append_report@v4
         with:
           prefix: '${{ needs.init.outputs.global_title }}'
           priority: '250'