From cb280a7855feab3ad71fa16e431de22ae447f617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20R=C3=B3=C5=BCa=C5=84ski?= Date: Tue, 19 Nov 2024 10:53:42 +0100 Subject: [PATCH] enable merge_queue --- .github/workflows/ci.yml | 5 +---- .github/workflows/systest.yml | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10aaa53a58..a8c4219955 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,10 +22,7 @@ on: workflow_dispatch: # run for all pull requests and pushes to certain branches pull_request: - push: - branches: - - staging - - trying + merge_queue: concurrency: group: ${{ github.base_ref == 'staging' && 'smci-staging' || format('smci-{0}-{1}', github.workflow, github.ref) }} diff --git a/.github/workflows/systest.yml b/.github/workflows/systest.yml index 234ce2247f..3c3e67ba65 100644 --- a/.github/workflows/systest.yml +++ b/.github/workflows/systest.yml @@ -9,10 +9,8 @@ on: log_level: description: "Log level" default: "debug" - push: - branches: - - staging - - trying + merge_queue: + env: GCLOUD_KEY: ${{ secrets.GCLOUD_KEY }} PROJECT_NAME: ${{ secrets.PROJECT_NAME }}