diff --git a/.github/workflows/auto-labeling.yml b/.github/workflows/auto-labeling.yml index 46ff3f44d9c..3f9e702f0e5 100644 --- a/.github/workflows/auto-labeling.yml +++ b/.github/workflows/auto-labeling.yml @@ -20,7 +20,8 @@ jobs: runs-on: ubuntu-latest if: | - !contains(github.event.pull_request.labels.*.name, 'flag/exclude-from-changelog') + (!contains( github.event.pull_request.labels.*.name, 'flag/exclude-from-changelog' ) + && !startsWith( github.head_ref, 'changeset-release/' )) steps: - uses: release-drafter/release-drafter@v5 @@ -33,8 +34,9 @@ jobs: runs-on: ubuntu-latest if: | - (!contains( github.event.pull_request.labels.*.name, 'flag/exclude-from-changelog' ) && - !startsWith( github.head_ref, 'dependabot/' )) + (!contains( github.event.pull_request.labels.*.name, 'flag/exclude-from-changelog' ) + && !startsWith( github.head_ref, 'changeset-release/' ) + && !startsWith( github.head_ref, 'dependabot/' )) steps: - uses: amannn/action-semantic-pull-request@v5 diff --git a/.github/workflows/ci-app.yml b/.github/workflows/ci-app.yml index 851793d14b2..b9c48e50eed 100644 --- a/.github/workflows/ci-app.yml +++ b/.github/workflows/ci-app.yml @@ -5,6 +5,7 @@ on: branches-ignore: - release/** - rc/** + - changeset-release/** paths: - .github/workflows/ci-app.yml - .eslint*