From dab66507e57a422f2cbb10b21be11379e46be9d0 Mon Sep 17 00:00:00 2001 From: joss Date: Wed, 3 Apr 2024 16:11:00 +0100 Subject: [PATCH 1/2] fix(controller-container): test a maintenance branch fix --- containers/controller/src/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/controller/src/controller.py b/containers/controller/src/controller.py index c0637643..5a31fead 100644 --- a/containers/controller/src/controller.py +++ b/containers/controller/src/controller.py @@ -2,4 +2,4 @@ if __name__ == "__main__": - logging.info("hello github!!!!+++") + logging.info("hello github!!!!+++this is a fix+++") From 66f3ed71742fb026b72fcb51a0b41e57f2a2152f Mon Sep 17 00:00:00 2001 From: joss Date: Wed, 3 Apr 2024 16:18:26 +0100 Subject: [PATCH 2/2] fix(controller-container): fix the maintenance release branch in the ci --- .github/workflows/controller-container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/controller-container.yaml b/.github/workflows/controller-container.yaml index 9f77d9cd..6970fd98 100644 --- a/.github/workflows/controller-container.yaml +++ b/.github/workflows/controller-container.yaml @@ -49,7 +49,7 @@ jobs: release-tag-format: 'controller-container-${version}' release-branches: | [ - 'maintenance/controller-container/release/[0-9]+\.([0-9]+|x)\.x', + 'maintenance/controller-container/[0-9]+\.([0-9]+|x)\.x', 'main' ] cosign-public-key: ${{ vars.COSIGN_PUBLIC_KEY }}