From 1348fbbcd277b89af40c28eae3cd6db69cc3dd3c Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Thu, 18 Apr 2024 14:21:09 +0100 Subject: [PATCH 1/2] Fix promtail windows test github action Signed-off-by: Michel Hollands --- .github/workflows/promtail-windows-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/promtail-windows-test.yml b/.github/workflows/promtail-windows-test.yml index 2a8f1d93ad273..410c81fa60cfe 100644 --- a/.github/workflows/promtail-windows-test.yml +++ b/.github/workflows/promtail-windows-test.yml @@ -1,8 +1,8 @@ name: Promtail Windows Test on: - pull_request: - tags: ['v[0-9].[0-9]+.[0-9]+'] - branches: [main, k*] + push: + tags: ['v[0-9].[0-9]+.[0-9]+'] + branches: [main, k*] jobs: build: runs-on: windows-latest From 0b7b082642cb7948a0eaf95cb3b5348dc43f7a03 Mon Sep 17 00:00:00 2001 From: Callum Styan Date: Thu, 18 Apr 2024 09:37:40 -0700 Subject: [PATCH 2/2] run on PR or push, include release branches Signed-off-by: Callum Styan --- .github/workflows/promtail-windows-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/promtail-windows-test.yml b/.github/workflows/promtail-windows-test.yml index 410c81fa60cfe..cb47ae2831612 100644 --- a/.github/workflows/promtail-windows-test.yml +++ b/.github/workflows/promtail-windows-test.yml @@ -1,8 +1,10 @@ name: Promtail Windows Test on: + pull_request: + branches: ["main", "k*", "release-[0-9]+.[0-9]+.x"] push: tags: ['v[0-9].[0-9]+.[0-9]+'] - branches: [main, k*] + branches: ["main", "k*", "release-[0-9]+.[0-9]+.x"] jobs: build: runs-on: windows-latest