From 5658fa6622ff8d9d49f966cfa754d922621eb54b Mon Sep 17 00:00:00 2001 From: joss Date: Wed, 3 Apr 2024 15:05:17 +0100 Subject: [PATCH 1/2] Revert "fix(controller-container): give pr write permission (#79)" This reverts commit 8100df4778b71e76d53637b8e31862e7491b8b4f. --- .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 528cd6bd..71343920 100644 --- a/.github/workflows/controller-container.yaml +++ b/.github/workflows/controller-container.yaml @@ -28,7 +28,7 @@ on: permissions: contents: write - pull-requests: write + pull-requests: read actions: read concurrency: From 5dd08a715413c4c141eeac19ce88c32a07c8bd5e Mon Sep 17 00:00:00 2001 From: joss Date: Wed, 3 Apr 2024 15:05:18 +0100 Subject: [PATCH 2/2] Revert "feat(controller-container): test release merge (#75)" This reverts commit 1f01eae2ed7559c07f09b78616e8ac9dd1bfe943. --- .github/workflows/controller-container.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/controller-container.yaml b/.github/workflows/controller-container.yaml index 71343920..492daf21 100644 --- a/.github/workflows/controller-container.yaml +++ b/.github/workflows/controller-container.yaml @@ -40,7 +40,7 @@ jobs: # Job name must be unique across repo to target # branch protection rules "required checks" properly! controller-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@feat/merge-release + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.6.0-containers with: job-name: controller-container registry: ${{ vars.HARBOR_REGISTRY }} @@ -52,15 +52,11 @@ jobs: 'maintenance/controller-container/release/[0-9]+\.([0-9]+|x)\.x', 'release/controller-container' ] - release-app-id: ${{ vars.RELEASE_APP_ID }} - release-app-client-id: ${{ vars.RELEASE_APP_CLIENT_ID }} - release-app-user: ${{ vars.RELEASE_APP_USER }} cosign-public-key: ${{ vars.COSIGN_PUBLIC_KEY }} slack-channel: ${{ vars.SLACK_CHANNEL }} build-file: containers/controller/Dockerfile build-context: containers/controller secrets: - release-app-private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }} cosign-private-key: ${{ secrets.COSIGN_PRIVATE_KEY }} cosign-password: ${{ secrets.COSIGN_PASSWORD }} registry-token: ${{ secrets.HARBOR_TOKEN }}