Skip to content

Commit

Permalink
Merge branch 'release/1.0.0-rc18'
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Hellmund committed Apr 14, 2022
2 parents b5bfc3a + b5bedb4 commit 276f1aa
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/release_phar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:

- name: Get commit message
run: |
echo ::set-env name=commitmsg::$(git tag -l --format='%(contents)' ${GITHUB_REF/refs\/tags\//})
echo "commitmsg=$(git tag -l --format='%(contents)' ${GITHUB_REF/refs\/tags\//})" >> $GITHUB_ENV
- name: Show commit message
run : echo $commitmsg
run : echo "${{ env.commitmsg }}"

- name: Setup PHP
uses: shivammathur/setup-php@v1
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
php-version: '7.4'
extensions: ctype, intl, json, mbstring, mysqli, pdo
coverage: none

Expand All @@ -45,7 +45,7 @@ jobs:
bin/console cache:warmup
- name: Build phar
uses: docker://php:7.3-cli-alpine3.10
uses: docker://php:7.4-cli-alpine3.10
with:
args: "/bin/sh -c \"apk --no-cache add git && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer && curl -LO https://github.com/humbug/box/releases/download/3.8.3/box.phar && mv box.phar /usr/local/bin/box && chmod +x /usr/local/bin/box && box compile && chmod 755 pwmgr.phar\""

Expand All @@ -57,7 +57,7 @@ jobs:
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
body: $commitmsg
body: ${{ env.commitmsg }}
draft: false
prerelease: contains('-rc', ${GITHUB_REF/refs\/tags\//}) || contains('-alpha', ${GITHUB_REF/refs\/tags\//}) || contains('-beta', ${GITHUB_REF/refs\/tags\//})

Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ variables:
WORDPRESS_TABLE_PREFIX: wp_

analysis:code-style:
image: php:7.3-cli-alpine
image: php:7.4-cli-alpine
stage: analysis
tags:
- docker
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "^7.3",
"php": "^7.4",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-json": "*",
Expand Down Expand Up @@ -62,7 +62,7 @@
},
"sort-packages": true,
"platform": {
"php": "7.3.12"
"php": "7.4.18"
},
"allow-plugins": {
"symfony/flex": true,
Expand Down
1 change: 0 additions & 1 deletion phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
parameters:
inferPrivatePropertyTypeFromConstructor: true
ignoreErrors:
- '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\).#'
-
message: '#Result of \|\| is always true.#'
path: 'src/Command/SelfUpdateCommand.php'

0 comments on commit 276f1aa

Please sign in to comment.