Skip to content
Snippets Groups Projects
Commit 6b6383ce authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main [MINOR_VERSION]

See merge request !24
parents 33f3a019 2e3adedc
No related branches found
No related tags found
1 merge request!24Merging develop into main [MINOR_VERSION]
......@@ -5,7 +5,7 @@ include:
variables:
VERSION: ${CI_COMMIT_TAG}
CI_VERSION: v2.0.21
CI_VERSION: v2.1.0
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
......@@ -34,7 +34,7 @@ php:
stage: build
parallel:
matrix:
- PHP: ['7.4','8.0','8.1']
- PHP: ['7.4','8.0','8.1','8.2']
script:
- docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} --build-arg CI_VERSION=${CI_VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
- docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION}
......
......@@ -17,7 +17,7 @@ $tasks = [
[
'attribute' => 'class',
'value' => 'PhpCSValidationInspection',
'content' => '<inspection_tool class="PhpCSValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true"><option name="CODING_STANDARD" value="Drupal" /><option name="EXTENSIONS" value="php,js,css,inc" /></inspection_tool>',
'content' => '<inspection_tool class="PhpCSValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true"><option name="CODING_STANDARD" value="DrupalPractice" /><option name="EXTENSIONS" value="php,js,css,inc" /></inspection_tool>',
],
],
],
......
......@@ -19,6 +19,8 @@ export PHP_VERSION=8.0
/usr/local/bin/update
export PHP_VERSION=8.1
/usr/local/bin/update
export PHP_VERSION=8.2
/usr/local/bin/update
echo "Cleaning old container"
docker kill l3drun >/dev/null
......@@ -4,7 +4,7 @@ function getConfig() {
if [[ ! -n ${PHP_VERSION} ]]; then
while true; do
DEFAULT=8.1
read -p "WhIich PHP version is your project using [7.1 - 7.4, 8.0 - 8.1]? " VALUE
read -p "WhIich PHP version is your project using [7.4, 8.0, 8.1, 8.2]? " VALUE
if [[ "x$VALUE" == "x" ]]; then
PHP_VERSION=$DEFAULT
else
......@@ -18,6 +18,7 @@ function getConfig() {
7.4) break ;;
8.0) break ;;
8.1) break ;;
8.2) break ;;
*) echo "Version not supported." ;;
esac
done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment