Merge pull request #177 from martin-helmich/chore/bump-phar-composer

Bump phar-composer to 1.4.0
martin-helmich · Feb 26, 2024 · 0902ebc · 0902ebc
2 parents 2888230 + d4f6f06
commit 0902ebc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.build/package.sh b/.build/package.sh
@@ -2,7 +2,7 @@
 
 VERSION="${1#v}"
 
-phar_composer_version="1.2.0"
+phar_composer_version="1.4.0"
 build_dir=".build/workspace"
 
 if [ -z "${VERSION}" ] ; then
@@ -15,7 +15,7 @@ set -e
 rm -rf "${build_dir}"
 mkdir -p "${build_dir}"
 
-cp -a typoscript-lint typoscript-lint.dist.yml services.yml src vendor composer.json composer.lock LICENSE "${build_dir}/" 
+cp -a typoscript-lint typoscript-lint.dist.yml services.yml src vendor composer.json composer.lock LICENSE "${build_dir}/"
 cd "${build_dir}/vendor" && rm -rf */*/tests/ */*/src/tests/ */*/docs/ */*/*.md */*/composer.* */*/phpunit.* */*/.gitignore */*/.*.yml */*/*.xml && cd - >/dev/null
 
 if [ ! -f phar-composer-${phar_composer_version}.phar ] ; then
@@ -29,6 +29,7 @@ chmod +x phar-composer-${phar_composer_version}.phar
 
 if [ -n "${signing_key}" ] ; then
   echo "${signing_key}" | gpg --import
-
-  gpg --detach-sign --output "${phar_name}.asc" "${phar_name}"
+
+  gpg --list-keys
+  gpg --detach-sign -u "${signing_key_fingerprint}" --output "${phar_name}.asc" "${phar_name}"
 fi
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,6 +22,7 @@ jobs:
         run: composer run-script package ${{ steps.tagName.outputs.tag }}
         env:
           signing_key: ${{ secrets.pharSigningKey }}
+          signing_key_fingerprint: ${{ secrets.PHAR_SIGNING_KEY_FINGERPRINT }}
 
       - name: Release
         uses: softprops/action-gh-release@v1
@@ -30,4 +31,4 @@ jobs:
             typoscript-lint-*.phar
             typoscript-lint-*.phar.asc
         env:
-          GITHUB_TOKEN: ${{ secrets.githubToken }}
+          GITHUB_TOKEN: ${{ github.token }}