diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fdf82fe..d8c1143 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,9 +31,15 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.RELEASE_USER_TOKEN }} - - name: Release ZIP on TER + - name: Prepare TER release run: | - composer publish-package - env: - TER_USERNAME: ${{ secrets.TER_USERNAME }} - TER_PASSWORD: ${{ secrets.TER_PASSWORD }} \ No newline at end of file + mkdir ter-upload + unzip -d ter-upload ./web2pdf_*.zip + + - name: Release ZIP on TER + uses: mittwald/typo3-publish-ter-action@v1.0.0-beta1 + with: + ter-username: ${{ secrets.TER_USERNAME }} + ter-password: ${{ secrets.TER_PASSWORD }} + extension-key: web2pdf + extension-dir: ./ter-upload \ No newline at end of file diff --git a/Build/publish-version.sh b/Build/publish-version.sh deleted file mode 100644 index c37bc96..0000000 --- a/Build/publish-version.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -if [ -n "${VERSION}" ] ; then - true # pass -elif [ -n "${GITHUB_REF}" ] ; then - VERSION="${GITHUB_REF/refs\/tags\//}" - VERSION="${VERSION#v}" -elif [ -n "${TRAVIS_TAG}" ] ; then - VERSION="${TRAVIS_TAG#v}" -fi - -if [ -z "${VERSION}" ] ; then - echo "could not determine version; make sure either VERSION, GITHUB_REF or TRAVIS_TAG is set" >&2 - exit 1 -fi - -rm -rf Release - -mkdir Release -pushd Release - -mkdir extension -unzip ../web2pdf_*.zip -d extension - -composer -n init -composer -n require --dev helhum/ter-client 'dev-master#2afdb1a04c0975a31ab4450daed732bc5f84ea7f' - -php -d default_socket_timeout=3600 vendor/bin/ter-client upload -u "${TER_USERNAME}" -p "${TER_PASSWORD}" -m "Release version ${VERSION}" web2pdf ./extension \ No newline at end of file diff --git a/composer.json b/composer.json index 63e2a72..4e9dbad 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,6 @@ }, "scripts": { "extension-package": ["bash -x Build/package-version.sh"], - "publish-package": ["bash -x Build/publish-version.sh"], "post-autoload-dump": [ "mkdir -p public/typo3conf/ext/", "[ -L public/typo3conf/ext/web2pdf ] || ln -snvf ../../../. public/typo3conf/ext/web2pdf"