Skip to content

Commit

Permalink
Update github-actions to 4.14.9 (#163)
Browse files Browse the repository at this point in the history
* Add docker logs output
* Move debug generation for install script before script execution
* Add comment for module activation to generate the banner in the debug script
* Output php error log after install, if it is not empty
* Fix variable substitution in templates
* Add echo to indicate which shop is cloned in prepare_shop
  • Loading branch information
release-github-action[bot] authored Jul 1, 2024
1 parent 6934774 commit dcd2baf
Show file tree
Hide file tree
Showing 21 changed files with 153 additions and 55 deletions.
11 changes: 7 additions & 4 deletions .github/oxid-esales/defaults/7.0.x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ global:
composer: &composer
dev_ref: &dev_ref dev-b-7.0.x

prepare_shop:
install: &install
matrix: *matrix
git: *git
composer:
Expand All @@ -32,19 +32,22 @@ prepare_shop:
}
}
# BEGIN Deprecated, will be superseded by install:
prepare_shop: *install

install_shop:
matrix: *matrix
git: *git

install_shop_with_modules: *install

install_module:
matrix: *matrix
git:
module:
ref: *default_ref
composer: *composer

install_shop_with_modules:
matrix: *matrix
# END Deprecated

runscript:
matrix: *matrix
Expand Down
11 changes: 7 additions & 4 deletions .github/oxid-esales/defaults/7.0.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ global:
composer: &composer
dev_ref: &dev_ref dev-b-7.0.x

prepare_shop:
install: &install
matrix: *matrix
git: *git
composer:
Expand All @@ -32,19 +32,22 @@ prepare_shop:
}
}
# BEGIN Deprecated, will be superseded by install:
prepare_shop: *install

install_shop:
matrix: *matrix
git: *git

install_shop_with_modules: *install

install_module:
matrix: *matrix
git:
module:
ref: *default_ref
composer: *composer

install_shop_with_modules:
matrix: *matrix
# END Deprecated

runscript:
matrix: *matrix
Expand Down
11 changes: 7 additions & 4 deletions .github/oxid-esales/defaults/7.1.x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ global:
composer: &composer
dev_ref: &dev_ref dev-b-7.1.x

prepare_shop:
install: &install
matrix: *matrix
git: *git
composer:
Expand All @@ -32,19 +32,22 @@ prepare_shop:
}
}
# BEGIN Deprecated, will be superseded by install:
prepare_shop: *install

install_shop:
matrix: *matrix
git: *git

install_shop_with_modules: *install

install_module:
matrix: *matrix
git:
module:
ref: *default_ref
composer: *composer

install_shop_with_modules:
matrix: *matrix
# END Deprecated

runscript:
matrix: *matrix_slim
Expand Down
11 changes: 7 additions & 4 deletions .github/oxid-esales/defaults/7.1.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ global:
composer: &composer
dev_ref: &dev_ref dev-b-7.1.x

prepare_shop:
install: &install
matrix: *matrix
git: *git
composer:
Expand All @@ -32,19 +32,22 @@ prepare_shop:
}
}
# BEGIN Deprecated, will be superseded by install:
prepare_shop: *install

install_shop:
matrix: *matrix
git: *git

install_shop_with_modules: *install

install_module:
matrix: *matrix
git:
module:
ref: *default_ref
composer: *composer

install_shop_with_modules:
matrix: *matrix
# END Deprecated

runscript:
matrix: *matrix_slim
Expand Down
11 changes: 7 additions & 4 deletions .github/oxid-esales/defaults/7.2.x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ global:
composer: &composer
dev_ref: &dev_ref dev-b-7.2.x

prepare_shop:
install: &install
matrix: *matrix
git: *git
composer:
Expand All @@ -33,19 +33,22 @@ prepare_shop:
}
}
# BEGIN Deprecated, will be superseded by install:
prepare_shop: *install

install_shop:
matrix: *matrix
git: *git

install_shop_with_modules: *install

install_module:
matrix: *matrix
git:
module:
ref: *default_ref
composer: *composer

install_shop_with_modules:
matrix: *matrix
# END Deprecated

runscript:
matrix: *matrix
Expand Down
11 changes: 7 additions & 4 deletions .github/oxid-esales/defaults/7.2.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ global:
composer: &composer
dev_ref: &dev_ref dev-b-7.2.x

prepare_shop:
install: &install
matrix: *matrix
git: *git
composer:
Expand All @@ -33,19 +33,22 @@ prepare_shop:
}
}
# BEGIN Deprecated, will be superseded by install:
prepare_shop: *install

install_shop:
matrix: *matrix
git: *git

install_shop_with_modules: *install

install_module:
matrix: *matrix
git:
module:
ref: *default_ref
composer: *composer

install_shop_with_modules:
matrix: *matrix
# END Deprecated

runscript:
matrix: *matrix
Expand Down
5 changes: 5 additions & 0 deletions .github/oxid-esales/defaults/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ install_shop:
output: &install_output
files: |
docker-compose.yml
docker*.log
source/composer.json*
source/composer.lock
source/source/config.inc.php
Expand Down Expand Up @@ -286,6 +287,7 @@ install_module:
output:
files: |
docker-compose.yml
docker*.log
source/composer.json*
source/composer.lock
source/source/config.inc.php
Expand Down Expand Up @@ -371,6 +373,7 @@ phpunit:
output:
# Which files should be archived
files: |
docker*.log
source/source/log/oxideshop.log
data/php/logs/error_log.txt
job_status*.txt
Expand Down Expand Up @@ -465,6 +468,7 @@ codeception:
output:
files: |
docker-compose.yml
docker*.log
source/composer.json
source/composer.lock
source/source/config.inc.php
Expand Down Expand Up @@ -531,6 +535,7 @@ runtest:

output:
files: |
docker*.log
source/unit.cov
source/source/log/oxideshop.log
source/test_config.yml
Expand Down
5 changes: 5 additions & 0 deletions .github/oxid-esales/defaults/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ install_shop:
output: &install_output
files: |
docker-compose.yml
docker*.log
source/composer.json*
source/composer.lock
source/source/config.inc.php
Expand Down Expand Up @@ -286,6 +287,7 @@ install_module:
output:
files: |
docker-compose.yml
docker*.log
source/composer.json*
source/composer.lock
source/source/config.inc.php
Expand Down Expand Up @@ -371,6 +373,7 @@ phpunit:
output:
# Which files should be archived
files: |
docker*.log
source/source/log/oxideshop.log
data/php/logs/error_log.txt
job_status*.txt
Expand Down Expand Up @@ -465,6 +468,7 @@ codeception:
output:
files: |
docker-compose.yml
docker*.log
source/composer.json
source/composer.lock
source/source/config.inc.php
Expand Down Expand Up @@ -531,6 +535,7 @@ runtest:

output:
files: |
docker*.log
source/unit.cov
source/source/log/oxideshop.log
source/test_config.yml
Expand Down
1 change: 1 addition & 0 deletions .github/oxid-esales/defaults/defaults_light.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ install_shop_with_modules:
output:
files: |
docker-compose.yml
docker*.log
source/composer.json*
source/composer.lock
source/source/config.inc.php
Expand Down
1 change: 1 addition & 0 deletions .github/oxid-esales/defaults/defaults_light.yml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ install_shop_with_modules:
output:
files: |
docker-compose.yml
docker*.log
source/composer.json*
source/composer.lock
source/source/config.inc.php
Expand Down
8 changes: 7 additions & 1 deletion .github/oxid-esales/defaults/ee.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ global:
enterprise_ref: '{{ .Github.RefName }}'

# See docs/actions/prepare_shop.md for more information.
prepare_shop:
install: &install
composer:
transform: |
{
Expand Down Expand Up @@ -68,19 +68,25 @@ prepare_shop:
# Needs to be here as $shop_type is different
prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'

# BEGIN Deprecated, will be superseded by install:
prepare_shop: *install

# See docs/actions/start_shop.md and docs/actions/install_shop.md for more information.
install_shop:
git: *git
is_enterprise: *is_enterprise
cache:
prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'

install_shop_with_modules: *install

install_module:
cache:
# Need to set this as we don't install a module. When installing a module:
# 'moduleInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
prefix: *install_shop_prefix
load_shop: *install_shop_prefix
# END Deprecated

phpunit:
load_shop: *install_shop_prefix
Expand Down
8 changes: 7 additions & 1 deletion .github/oxid-esales/defaults/ee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ global:
enterprise_ref: '{{ .Github.RefName }}'

# See docs/actions/prepare_shop.md for more information.
prepare_shop:
install: &install
composer:
transform: |
{
Expand Down Expand Up @@ -68,19 +68,25 @@ prepare_shop:
# Needs to be here as $shop_type is different
prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'

# BEGIN Deprecated, will be superseded by install:
prepare_shop: *install

# See docs/actions/start_shop.md and docs/actions/install_shop.md for more information.
install_shop:
git: *git
is_enterprise: *is_enterprise
cache:
prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'

install_shop_with_modules: *install

install_module:
cache:
# Need to set this as we don't install a module. When installing a module:
# 'moduleInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
prefix: *install_shop_prefix
load_shop: *install_shop_prefix
# END Deprecated

phpunit:
load_shop: *install_shop_prefix
Expand Down
Loading

0 comments on commit dcd2baf

Please sign in to comment.