diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 686d745eeb09..d995d4f2a76f 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -2,6 +2,7 @@ name: Binary builds on: pull_request: + merge_group: push: branches: - stackstate-7.78.2 diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml index 599eefb81c23..6fbfe3a4179a 100644 --- a/.github/workflows/build-deb.yml +++ b/.github/workflows/build-deb.yml @@ -2,6 +2,7 @@ name: DEB package build on: pull_request: + merge_group: push: branches: - stackstate-7.78.2 @@ -191,14 +192,14 @@ jobs: --install-directory /opt/stackstate-agent - name: Save omnibus git cache (${{ matrix.arch }}) - if: github.event_name != 'pull_request' && steps.omnibus-git-cache.outputs.cache-hit != 'true' + if: github.event_name != 'pull_request' && github.event_name != 'merge_group' && steps.omnibus-git-cache.outputs.cache-hit != 'true' uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: ${{ env.OMNIBUS_GIT_CACHE_DIR }} key: omnibus-git-${{ matrix.arch }}-${{ hashFiles('omnibus/**', 'release.json') }} - name: Save bazel caches (${{ matrix.arch }}) - if: github.event_name != 'pull_request' && steps.bazel-cache.outputs.cache-hit != 'true' + if: github.event_name != 'pull_request' && github.event_name != 'merge_group' && steps.bazel-cache.outputs.cache-hit != 'true' uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | diff --git a/.github/workflows/lint-and-unit-tests.yml b/.github/workflows/lint-and-unit-tests.yml index dabd08eda56e..52d7a41b0fc2 100644 --- a/.github/workflows/lint-and-unit-tests.yml +++ b/.github/workflows/lint-and-unit-tests.yml @@ -2,6 +2,7 @@ name: Lint and unit tests on: pull_request: + merge_group: push: branches: - stackstate-7.78.2