From ebf4ef90324771f11e95794ea0bdf97fd155a724 Mon Sep 17 00:00:00 2001 From: Alan Clucas Date: Wed, 8 May 2024 21:04:39 +0100 Subject: [PATCH 1/2] ci: run E2E tests if `Dockerfile` changes (#13024) Signed-off-by: Alan Clucas Signed-off-by: Anton Gilgur Co-authored-by: Anton Gilgur --- .github/workflows/ci-build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 46394592571e..ad7e2c4b030d 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -56,6 +56,7 @@ jobs: e2e-tests: - *tests # plus manifests and SDKs that are used in E2E tests + - Dockerfile - manifests/** - sdks/** codegen: From e3b0bb6b289eafcbe5ecea9c1e3b920ca2bc31a8 Mon Sep 17 00:00:00 2001 From: Alan Clucas Date: Wed, 8 May 2024 21:52:13 +0100 Subject: [PATCH 2/2] fix: don't rebuild `ui/dist/app/index.html` in `argocli-build` stage (#13023) Signed-off-by: Alan Clucas Co-authored-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com> --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8faf9c191cdc..c6b49a7c0d2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,6 +71,8 @@ ARG GIT_TREE_STATE RUN mkdir -p ui/dist COPY --from=argo-ui ui/dist/app ui/dist/app +# update timestamp so that `make` doesn't try to rebuild this -- it was already built in the previous stage +RUN touch ui/dist/app/index.html RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build STATIC_FILES=true make dist/argo GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE}