diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5f8507e..746a090 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ name: 'Release' on: - pull_request: + pull_request_target: types: [closed] branches: - 'preview/**' @@ -33,15 +33,15 @@ jobs: runs-on: ubuntu-latest outputs: - is-release: ${{ startsWith(github.base_ref, 'release') }} - is-preview: ${{ startsWith(github.base_ref, 'preview') }} + is-release: ${{ startsWith(github.head_ref, 'release') }} + is-preview: ${{ startsWith(github.head_ref, 'preview') }} steps: - name: 'Set workflow variables' id: github run: | - echo "is-release:${{ startsWith(github.base_ref, 'release') }}" - echo "is-preview:${{ startsWith(github.base_ref, 'preview') }}" + echo "is-release:${{ startsWith(github.head_ref, 'release') }}" + echo "is-preview:${{ startsWith(github.head_ref, 'preview') }}" validate-release: name: 'Validate release' @@ -80,13 +80,13 @@ jobs: id: extract-version uses: './.github/actions/versioning/extract-version' with: - branch-name: ${{ github.base_ref }} + branch-name: ${{ github.head_ref }} - name: 'Create build number' shell: bash id: create-build-number run: | git fetch --unshallow --filter=tree:0 - build_number=$(git rev-list --count origin/${{ github.base_ref }} ^origin/main) + build_number=$(git rev-list --count origin/${{ github.head_ref }} ^origin/main) echo "build-number=$build_number" >> $GITHUB_OUTPUT - name: 'Create pre-release tag' shell: bash @@ -100,7 +100,7 @@ jobs: pre_release_tag='preview' echo "pre-release-tag=$pre_release_tag" >> $GITHUB_OUTPUT else - pre_release_tag=$(echo ${{ github.base_ref }} | tr '/' '-' | tr '.' '-'| tr '_' '-') + pre_release_tag=$(echo ${{ github.head_ref }} | tr '/' '-' | tr '.' '-'| tr '_' '-') echo "pre-release-tag=$pre_release_tag" >> $GITHUB_OUTPUT fi - name: 'Format version'