From 887163725dfa5d49ee4f4eff6e12bdfb0d49f387 Mon Sep 17 00:00:00 2001 From: Joss Whittle Date: Wed, 21 Feb 2024 19:08:17 +0000 Subject: [PATCH 1/6] ci: cache base containers from microsoft container registry via harbor (#569) --- .github/workflows/api-container.yaml | 2 +- .github/workflows/egress-api-container.yaml | 2 +- .github/workflows/egress-ui-container.yaml | 2 +- .github/workflows/tre-api-container.yaml | 2 +- .github/workflows/tre-hasura-container.yaml | 2 +- .github/workflows/tre-ui-container.yaml | 2 +- .github/workflows/ui-container.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/api-container.yaml b/.github/workflows/api-container.yaml index c77a54b10..e69ce990b 100644 --- a/.github/workflows/api-container.yaml +++ b/.github/workflows/api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.3.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 with: job-name: api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/egress-api-container.yaml b/.github/workflows/egress-api-container.yaml index 18e8a533d..73ac4d634 100644 --- a/.github/workflows/egress-api-container.yaml +++ b/.github/workflows/egress-api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: egress-api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.3.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 with: job-name: egress-api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/egress-ui-container.yaml b/.github/workflows/egress-ui-container.yaml index a0000cc96..07c60358e 100644 --- a/.github/workflows/egress-ui-container.yaml +++ b/.github/workflows/egress-ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: egress-ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.3.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 with: job-name: egress-ui-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-api-container.yaml b/.github/workflows/tre-api-container.yaml index 9829454f2..0ae7bfa1e 100644 --- a/.github/workflows/tre-api-container.yaml +++ b/.github/workflows/tre-api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.3.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 with: job-name: tre-api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-hasura-container.yaml b/.github/workflows/tre-hasura-container.yaml index 37cbf8c31..baf9d8840 100644 --- a/.github/workflows/tre-hasura-container.yaml +++ b/.github/workflows/tre-hasura-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-hasura-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.3.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 with: job-name: tre-hasura-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-ui-container.yaml b/.github/workflows/tre-ui-container.yaml index 1a8d475ca..a7970e9a1 100644 --- a/.github/workflows/tre-ui-container.yaml +++ b/.github/workflows/tre-ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.3.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 with: job-name: tre-ui-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/ui-container.yaml b/.github/workflows/ui-container.yaml index 369bbfde2..710c32e70 100644 --- a/.github/workflows/ui-container.yaml +++ b/.github/workflows/ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.3.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 with: job-name: ui-container registry: ${{ vars.HARBOR_REGISTRY }} From 64e38e78aeb7ccf21e91305f41b9f731b70a5a4a Mon Sep 17 00:00:00 2001 From: Joss Whittle Date: Thu, 22 Feb 2024 11:04:22 +0000 Subject: [PATCH 2/6] chore: Test release (#571) --- src/DARE-API/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DARE-API/Dockerfile b/src/DARE-API/Dockerfile index e2028255c..10db8d857 100644 --- a/src/DARE-API/Dockerfile +++ b/src/DARE-API/Dockerfile @@ -1,5 +1,5 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. - +# test FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base ENV ASPNETCORE_ENVIRONMENT=Development From e76a47017d62541609458e077b09ce4328365e0a Mon Sep 17 00:00:00 2001 From: Joss Whittle Date: Thu, 22 Feb 2024 11:58:25 +0000 Subject: [PATCH 3/6] fix: fixes bug where release pipeline failed silently when no conventional commits were found that would trigger a release (#573) --- .github/workflows/api-container.yaml | 2 +- .github/workflows/egress-api-container.yaml | 2 +- .github/workflows/egress-ui-container.yaml | 2 +- .github/workflows/tre-api-container.yaml | 2 +- .github/workflows/tre-hasura-container.yaml | 2 +- .github/workflows/tre-ui-container.yaml | 2 +- .github/workflows/ui-container.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/api-container.yaml b/.github/workflows/api-container.yaml index e69ce990b..dcb07e18e 100644 --- a/.github/workflows/api-container.yaml +++ b/.github/workflows/api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 with: job-name: api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/egress-api-container.yaml b/.github/workflows/egress-api-container.yaml index 73ac4d634..acf75c807 100644 --- a/.github/workflows/egress-api-container.yaml +++ b/.github/workflows/egress-api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: egress-api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 with: job-name: egress-api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/egress-ui-container.yaml b/.github/workflows/egress-ui-container.yaml index 07c60358e..f9a42ef6b 100644 --- a/.github/workflows/egress-ui-container.yaml +++ b/.github/workflows/egress-ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: egress-ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 with: job-name: egress-ui-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-api-container.yaml b/.github/workflows/tre-api-container.yaml index 0ae7bfa1e..41a611ff5 100644 --- a/.github/workflows/tre-api-container.yaml +++ b/.github/workflows/tre-api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 with: job-name: tre-api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-hasura-container.yaml b/.github/workflows/tre-hasura-container.yaml index baf9d8840..b9f790078 100644 --- a/.github/workflows/tre-hasura-container.yaml +++ b/.github/workflows/tre-hasura-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-hasura-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 with: job-name: tre-hasura-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-ui-container.yaml b/.github/workflows/tre-ui-container.yaml index a7970e9a1..ad96a885f 100644 --- a/.github/workflows/tre-ui-container.yaml +++ b/.github/workflows/tre-ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 with: job-name: tre-ui-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/ui-container.yaml b/.github/workflows/ui-container.yaml index 710c32e70..0201ffa52 100644 --- a/.github/workflows/ui-container.yaml +++ b/.github/workflows/ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.0 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 with: job-name: ui-container registry: ${{ vars.HARBOR_REGISTRY }} From 0fa29c0cfc69bbba8c632e8a59dd2336482b08cf Mon Sep 17 00:00:00 2001 From: Joss Whittle Date: Thu, 22 Feb 2024 11:59:44 +0000 Subject: [PATCH 4/6] test: Trigger release pipeline that will not create a release (#574) --- src/DARE-API/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DARE-API/Dockerfile b/src/DARE-API/Dockerfile index 10db8d857..e2028255c 100644 --- a/src/DARE-API/Dockerfile +++ b/src/DARE-API/Dockerfile @@ -1,5 +1,5 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -# test + FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base ENV ASPNETCORE_ENVIRONMENT=Development From 8909952a1eaafc7602e3844ff7e6ff1ea3015ee7 Mon Sep 17 00:00:00 2001 From: Joss Whittle Date: Thu, 22 Feb 2024 16:21:52 +0000 Subject: [PATCH 5/6] ci: bump container workflow version so renovate can track it (#575) --- .github/workflows/api-container.yaml | 2 +- .github/workflows/egress-api-container.yaml | 2 +- .github/workflows/egress-ui-container.yaml | 2 +- .github/workflows/tre-api-container.yaml | 2 +- .github/workflows/tre-hasura-container.yaml | 2 +- .github/workflows/tre-ui-container.yaml | 2 +- .github/workflows/ui-container.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/api-container.yaml b/.github/workflows/api-container.yaml index dcb07e18e..663136302 100644 --- a/.github/workflows/api-container.yaml +++ b/.github/workflows/api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers with: job-name: api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/egress-api-container.yaml b/.github/workflows/egress-api-container.yaml index acf75c807..8a3046233 100644 --- a/.github/workflows/egress-api-container.yaml +++ b/.github/workflows/egress-api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: egress-api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers with: job-name: egress-api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/egress-ui-container.yaml b/.github/workflows/egress-ui-container.yaml index f9a42ef6b..ac60a39a3 100644 --- a/.github/workflows/egress-ui-container.yaml +++ b/.github/workflows/egress-ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: egress-ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers with: job-name: egress-ui-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-api-container.yaml b/.github/workflows/tre-api-container.yaml index 41a611ff5..59ba36234 100644 --- a/.github/workflows/tre-api-container.yaml +++ b/.github/workflows/tre-api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers with: job-name: tre-api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-hasura-container.yaml b/.github/workflows/tre-hasura-container.yaml index b9f790078..fa604f13e 100644 --- a/.github/workflows/tre-hasura-container.yaml +++ b/.github/workflows/tre-hasura-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-hasura-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers with: job-name: tre-hasura-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-ui-container.yaml b/.github/workflows/tre-ui-container.yaml index ad96a885f..5b280b607 100644 --- a/.github/workflows/tre-ui-container.yaml +++ b/.github/workflows/tre-ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers with: job-name: tre-ui-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/ui-container.yaml b/.github/workflows/ui-container.yaml index 0201ffa52..95f40c807 100644 --- a/.github/workflows/ui-container.yaml +++ b/.github/workflows/ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@containers-v1.4.1 + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers with: job-name: ui-container registry: ${{ vars.HARBOR_REGISTRY }} From 9c514ec5a160d4e1de9b3fc861c3ca709ec31067 Mon Sep 17 00:00:00 2001 From: "dare-renovate[bot]" <131777703+dare-renovate[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:27:46 +0000 Subject: [PATCH 6/6] chore(deps): update swanseauniversitymedical/workflows action to v1.4.2 (#576) Co-authored-by: dare-renovate[bot] <129118232+dare-renovate[bot]@users.noreply.github.enterprise.com> --- .github/workflows/api-container.yaml | 2 +- .github/workflows/egress-api-container.yaml | 2 +- .github/workflows/egress-ui-container.yaml | 2 +- .github/workflows/tre-api-container.yaml | 2 +- .github/workflows/tre-hasura-container.yaml | 2 +- .github/workflows/tre-ui-container.yaml | 2 +- .github/workflows/ui-container.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/api-container.yaml b/.github/workflows/api-container.yaml index 663136302..0f8985a98 100644 --- a/.github/workflows/api-container.yaml +++ b/.github/workflows/api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.2-containers with: job-name: api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/egress-api-container.yaml b/.github/workflows/egress-api-container.yaml index 8a3046233..2643f4ff4 100644 --- a/.github/workflows/egress-api-container.yaml +++ b/.github/workflows/egress-api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: egress-api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.2-containers with: job-name: egress-api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/egress-ui-container.yaml b/.github/workflows/egress-ui-container.yaml index ac60a39a3..88cd64e0f 100644 --- a/.github/workflows/egress-ui-container.yaml +++ b/.github/workflows/egress-ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: egress-ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.2-containers with: job-name: egress-ui-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-api-container.yaml b/.github/workflows/tre-api-container.yaml index 59ba36234..605a84607 100644 --- a/.github/workflows/tre-api-container.yaml +++ b/.github/workflows/tre-api-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-api-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.2-containers with: job-name: tre-api-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-hasura-container.yaml b/.github/workflows/tre-hasura-container.yaml index fa604f13e..629558cd4 100644 --- a/.github/workflows/tre-hasura-container.yaml +++ b/.github/workflows/tre-hasura-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-hasura-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.2-containers with: job-name: tre-hasura-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/tre-ui-container.yaml b/.github/workflows/tre-ui-container.yaml index 5b280b607..fc83eef68 100644 --- a/.github/workflows/tre-ui-container.yaml +++ b/.github/workflows/tre-ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: tre-ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.2-containers with: job-name: tre-ui-container registry: ${{ vars.HARBOR_REGISTRY }} diff --git a/.github/workflows/ui-container.yaml b/.github/workflows/ui-container.yaml index 95f40c807..6e6ed01c9 100644 --- a/.github/workflows/ui-container.yaml +++ b/.github/workflows/ui-container.yaml @@ -23,7 +23,7 @@ concurrency: jobs: ui-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v1.4.2-containers with: job-name: ui-container registry: ${{ vars.HARBOR_REGISTRY }}