Skip to content

Commit

Permalink
Update github-actions to 4.12.3 (#150)
Browse files Browse the repository at this point in the history
* Remove duplicate copy/paste
* Fix load_testplan
* Fix rename template issues with old workflows
* Sync yaml files and standardize load_testplan logging
  • Loading branch information
release-github-action[bot] authored May 24, 2024
1 parent 5d8cd42 commit 4d7db78
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 14 deletions.
15 changes: 12 additions & 3 deletions .github/oxid-esales/defaults/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ init:
# for the install_shop and shop_setup tests. It generates a cached object
# used in those steps.
# See docs/actions/prepare_shop.md for more information on the custom action.
prepare_shop:
prepare_shop: &prepare_shop
matrix: *matrix
max_parallel: *max_parallel
docker_login: *docker_login
Expand Down Expand Up @@ -230,7 +230,7 @@ install_shop:
prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'

# Modifying source/source/config.inc.php
config:
config: &install_config
# Set iDebug in source/source/config.inc.php
idebug: false
# Run custom script outside the container
Expand All @@ -240,7 +240,7 @@ install_shop:
custom_script_container: ''

# Exporting an artifact with Configuration files for the shop setup
output:
output: &install_output
files: |
docker-compose.yml
source/composer.json*
Expand All @@ -251,6 +251,15 @@ install_shop:
# The configuration file name is dynamic, the matrix variables will be appended
artifact_prefix: 'configs_install_shop'

# This section here is for compatibility reasons with the _rename template
install:
<<: *prepare_shop
is_enterprise: *is_enterprise
config: *install_config
custom_script: ''
custom_script_container: ''
output: *install_output

# This installs a single module for testing. If no module is defined, you need
# to ensure that the cache_prefix for this step is identical to the cache_prefix
# from install_shop
Expand Down
15 changes: 12 additions & 3 deletions .github/oxid-esales/defaults/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ init:
# for the install_shop and shop_setup tests. It generates a cached object
# used in those steps.
# See docs/actions/prepare_shop.md for more information on the custom action.
prepare_shop:
prepare_shop: &prepare_shop
matrix: *matrix
max_parallel: *max_parallel
docker_login: *docker_login
Expand Down Expand Up @@ -230,7 +230,7 @@ install_shop:
prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'

# Modifying source/source/config.inc.php
config:
config: &install_config
# Set iDebug in source/source/config.inc.php
idebug: false
# Run custom script outside the container
Expand All @@ -240,7 +240,7 @@ install_shop:
custom_script_container: ''

# Exporting an artifact with Configuration files for the shop setup
output:
output: &install_output
files: |
docker-compose.yml
source/composer.json*
Expand All @@ -251,6 +251,15 @@ install_shop:
# The configuration file name is dynamic, the matrix variables will be appended
artifact_prefix: 'configs_install_shop'

# This section here is for compatibility reasons with the _rename template
install:
<<: *prepare_shop
is_enterprise: *is_enterprise
config: *install_config
custom_script: ''
custom_script_container: ''
output: *install_output

# This installs a single module for testing. If no module is defined, you need
# to ensure that the cache_prefix for this step is identical to the cache_prefix
# from install_shop
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/universal_workflow_light.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ jobs:
set_output: true
set_env: true
set_print: true
# loglevel: trace
# logfile: load_testplan.log
loglevel: info
logfile: load_testplan_init.log
yaml: generated_testplan.yaml

- name: 'Prepare artifact and generate safe title'
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
generated_testplan.yaml
generated_output.txt
generated_env.txt
load_testplan.log
load_testplan_init.log
debug: ${{ inputs.debug }}

- name: 'Write Report'
Expand Down Expand Up @@ -266,6 +266,8 @@ jobs:
set_print: true
set_env: true
yaml: generated_testplan.yaml
loglevel: info
logfile: load_testplan_install.log
token: ${{ secrets.enterprise_github_token }}

- name: 'Prepare Shop'
Expand Down Expand Up @@ -442,7 +444,7 @@ jobs:
if: always()
shell: bash
run: |
# install_shop: Write files list
# install: Write files list
find . >files.txt
# Compensate for multiline problems
{
Expand All @@ -457,6 +459,9 @@ jobs:
with:
name: '${{ steps.iltp.outputs.install_output_artifact_prefix }}-${{steps.itn.outputs.matrix_suffix}}'
path: |-
files.txt
generated_testplan.yaml
load_testplan_install.log
${{ env.ARTIFACT_PATHS }}
- name: Run custom scripts
Expand Down Expand Up @@ -566,6 +571,8 @@ jobs:
set_print: true
set_env: true
yaml: generated_testplan.yaml
loglevel: info
logfile: load_testplan_runscript.log
token: ${{ secrets.enterprise_github_token }}

- name: Convert variables
Expand Down Expand Up @@ -736,6 +743,8 @@ jobs:
set_print: true
set_env: true
yaml: generated_testplan.yaml
loglevel: info
logfile: load_testplan_runslim.log
token: ${{ secrets.enterprise_github_token }}

- name: Convert variables
Expand Down Expand Up @@ -900,6 +909,8 @@ jobs:
set_output: true
set_print: true
yaml: generated_testplan.yaml
loglevel: info
logfile: load_testplan_sonarcloud.log
token: ${{ secrets.enterprise_github_token }}

- name: Checkout shop
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/universal_workflow_light.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ jobs:
set_output: true
set_env: true
set_print: true
# loglevel: trace
# logfile: load_testplan.log
loglevel: info
logfile: load_testplan_init.log
yaml: generated_testplan.yaml

- name: 'Prepare artifact and generate safe title'
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
generated_testplan.yaml
generated_output.txt
generated_env.txt
load_testplan.log
load_testplan_init.log
debug: ${{ inputs.debug }}

- name: 'Write Report'
Expand Down Expand Up @@ -266,6 +266,8 @@ jobs:
set_print: true
set_env: true
yaml: generated_testplan.yaml
loglevel: info
logfile: load_testplan_install.log
token: ${{ secrets.enterprise_github_token }}

- name: 'Prepare Shop'
Expand Down Expand Up @@ -442,7 +444,7 @@ jobs:
if: always()
shell: bash
run: |
# install_shop: Write files list
# install: Write files list
find . >files.txt
# Compensate for multiline problems
{
Expand All @@ -457,6 +459,9 @@ jobs:
with:
name: '${{ steps.iltp.outputs.install_output_artifact_prefix }}-${{steps.itn.outputs.matrix_suffix}}'
path: |-
files.txt
generated_testplan.yaml
load_testplan_install.log
${{ env.ARTIFACT_PATHS }}
- name: Run custom scripts
Expand Down Expand Up @@ -566,6 +571,8 @@ jobs:
set_print: true
set_env: true
yaml: generated_testplan.yaml
loglevel: info
logfile: load_testplan_runscript.log
token: ${{ secrets.enterprise_github_token }}

- name: Convert variables
Expand Down Expand Up @@ -736,6 +743,8 @@ jobs:
set_print: true
set_env: true
yaml: generated_testplan.yaml
loglevel: info
logfile: load_testplan_runslim.log
token: ${{ secrets.enterprise_github_token }}

- name: Convert variables
Expand Down Expand Up @@ -900,6 +909,8 @@ jobs:
set_output: true
set_print: true
yaml: generated_testplan.yaml
loglevel: info
logfile: load_testplan_sonarcloud.log
token: ${{ secrets.enterprise_github_token }}

- name: Checkout shop
Expand Down
1 change: 1 addition & 0 deletions append_report/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ runs:
with:
name: '${{ steps.safe_title.outputs.title }}'
path: |
load_testplan*.log
job_status/*.txt
reports/*.md
slack_reports/*.md
Expand Down

0 comments on commit 4d7db78

Please sign in to comment.