From 828b4dc9b985a3e73e7e58336e1837ec253700b2 Mon Sep 17 00:00:00 2001 From: "release-github-action[bot]" <154503118+release-github-action[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2024 11:01:56 +0200 Subject: [PATCH] Update github-actions to 4.14.15 (#170) * Bump raven-actions/actionlint from 1 to 2 * Improve token handling in debug script * Fix transform handling on skip --- .../workflows/call-universal_test_workflow.yaml | 2 +- .../workflows/call-universal_test_workflow.yml | 2 +- .github/workflows/push-validate_workflows.yaml | 2 +- .github/workflows/universal_workflow_light.yaml | 15 ++++++++++++--- .github/workflows/universal_workflow_light.yml | 15 ++++++++++++--- append_report/action.yaml | 8 ++++++++ begin_report/action.yaml | 3 +++ 7 files changed, 38 insertions(+), 9 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..7beef909 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -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 }} @@ -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 @@ -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'] @@ -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'] @@ -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'] @@ -1209,6 +1216,7 @@ jobs: testplan: '' status: ${{job.status}} debug: false + github_token: ${{ secrets.enterprise_github_token || github.token }} actionlint: needs: ['init', 'install'] @@ -1231,7 +1239,7 @@ jobs: - name: Run actionlint id: actionlint - uses: raven-actions/actionlint@v1 + uses: raven-actions/actionlint@v2 - name: actionlint Summary if: always() @@ -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' }} diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index f0dd7847..7beef909 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -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 }} @@ -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 @@ -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'] @@ -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'] @@ -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'] @@ -1209,6 +1216,7 @@ jobs: testplan: '' status: ${{job.status}} debug: false + github_token: ${{ secrets.enterprise_github_token || github.token }} actionlint: needs: ['init', 'install'] @@ -1231,7 +1239,7 @@ jobs: - name: Run actionlint id: actionlint - uses: raven-actions/actionlint@v1 + uses: raven-actions/actionlint@v2 - name: actionlint Summary if: always() @@ -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' }} 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}" <