diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index 2f84a4a..142e70b 100644 --- a/.github/workflows/appstore-build-publish.yml +++ b/.github/workflows/appstore-build-publish.yml @@ -188,32 +188,12 @@ jobs: cd ${{ env.APP_NAME }}/build/artifacts tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }} - - name: Set up PHP 8.3 for release-tool - uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 - with: - php-version: '8.3' - coverage: none - - - id: release-tool - name: Setup release-tool v0.11.1 - shell: bash - run: | - set -euo pipefail - base="https://github.com/LibreCodeCoop/release-tool/releases/download/v0.11.1" - curl --fail --silent --show-error --location "${base}/release-tool.phar" -o "${RUNNER_TEMP}/release-tool.phar" - curl --fail --silent --show-error --location "${base}/release-tool.phar.sha256" -o "${RUNNER_TEMP}/release-tool.phar.sha256" - (cd "${RUNNER_TEMP}" && sha256sum --check release-tool.phar.sha256) - echo "path=${RUNNER_TEMP}/release-tool.phar" >> "${GITHUB_OUTPUT}" - - name: Validate release artifact - shell: bash - env: - RELEASE_TOOL_PATH: ${{ steps.release-tool.outputs.path }} - run: >- - php "${RELEASE_TOOL_PATH}" artifact:validate-package - --artifact "${APP_NAME}/build/artifacts/${APP_NAME}.tar.gz" - --app-name "${APP_NAME}" - --expected-version "${APP_VERSION}" + uses: LibreCodeCoop/release-tool/actions/artifact-validate@710c4c83fba47bf01713f46e9c4cb4cf63debfba + with: + artifact: ${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}.tar.gz + app-name: ${{ env.APP_NAME }} + version: ${{ env.APP_VERSION }} - name: Attach tarball to github release uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de # 2.11.5 @@ -234,12 +214,8 @@ jobs: app_private_key: ${{ secrets.APP_PRIVATE_KEY }} - name: Verify App Store publication - shell: bash - env: - RELEASE_TOOL_PATH: ${{ steps.release-tool.outputs.path }} - NEXTCLOUD_PLATFORM: ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }} - run: >- - php "${RELEASE_TOOL_PATH}" publication:wait-appstore - --app-name "${APP_NAME}" - --version "${APP_VERSION}" - --platform "${NEXTCLOUD_PLATFORM}" + uses: LibreCodeCoop/release-tool/actions/appstore-publication-wait@710c4c83fba47bf01713f46e9c4cb4cf63debfba + with: + app-name: ${{ env.APP_NAME }} + version: ${{ env.APP_VERSION }} + platform: ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }} diff --git a/.github/workflows/release-nextcloud-app.yml b/.github/workflows/release-nextcloud-app.yml index 0ca92b9..b8202d3 100644 --- a/.github/workflows/release-nextcloud-app.yml +++ b/.github/workflows/release-nextcloud-app.yml @@ -55,50 +55,16 @@ jobs: fetch-depth: 0 persist-credentials: false - - name: Set up PHP 8.3 for release-tool - uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 - with: - php-version: '8.3' - coverage: none - - - id: release-tool - name: Setup release-tool v0.11.2 - shell: bash - run: | - set -euo pipefail - base="https://github.com/LibreCodeCoop/release-tool/releases/download/v0.11.2" - curl --fail --silent --show-error --location "${base}/release-tool.phar" -o "${RUNNER_TEMP}/release-tool.phar" - curl --fail --silent --show-error --location "${base}/release-tool.phar.sha256" -o "${RUNNER_TEMP}/release-tool.phar.sha256" - (cd "${RUNNER_TEMP}" && sha256sum --check release-tool.phar.sha256) - echo "path=${RUNNER_TEMP}/release-tool.phar" >> "${GITHUB_OUTPUT}" - - name: Validate release plan - shell: bash - env: - GITHUB_TOKEN: ${{ github.token }} - RELEASE_TOOL_PATH: ${{ steps.release-tool.outputs.path }} - RELEASE_VERSION: ${{ inputs.version }} - STABLE_BRANCH: ${{ inputs.stable_branch }} - RELEASE_MILESTONE: ${{ inputs.milestone }} - BLOCKER_QUERIES: ${{ inputs.blocker_queries }} - run: | - set -euo pipefail - plan="${RUNNER_TEMP}/release-preflight.json" - php "${RELEASE_TOOL_PATH}" release:preflight \ - --version "${RELEASE_VERSION}" \ - --stable-branch "${STABLE_BRANCH}" \ - --current-ref "${STABLE_BRANCH}" \ - --repository "${GITHUB_REPOSITORY}" \ - --milestone "${RELEASE_MILESTONE}" \ - --blocker-queries-json "${BLOCKER_QUERIES}" \ - --json | tee "${plan}" - { - echo "## Release preflight" - echo - echo '~~~json' - cat "${plan}" - echo '~~~' - } >> "${GITHUB_STEP_SUMMARY}" + uses: LibreCodeCoop/release-tool/actions/release-preflight@710c4c83fba47bf01713f46e9c4cb4cf63debfba + with: + version: ${{ inputs.version }} + stable-branch: ${{ inputs.stable_branch }} + current-ref: ${{ inputs.stable_branch }} + repository: ${{ github.repository }} + milestone: ${{ inputs.milestone }} + blocker-queries-json: ${{ inputs.blocker_queries }} + github-token: ${{ github.token }} - name: Validate publication credentials env: