From fc05c5775154d8e3f46f38f7cc1a96c33a48f548 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Sun, 8 Oct 2023 11:01:21 +0200 Subject: [PATCH 1/3] gitlab ci: deploy main --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b9caac6f..039ba6d68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ deployment: # make sure that changes are deployed only when they are merged to master only: refs: - - master + - main # need the doxygen artifacts for this step dependencies: - generate-docs From ec039428674fd5320f6258c1481ee3d403fa0a8e Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Sun, 8 Oct 2023 11:02:24 +0200 Subject: [PATCH 2/3] Gitlab: new tag for cvmfs enabled runners --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 039ba6d68..c98faed71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ generate-docs: # need a runner with cvmfs installed. On the CERN gitlab instance, # these are usually tagged with "cvmfs" tags: - - cvmfs + - k8s-cvmfs script: # use a setup that provides all dependencies - if the dependencies change, # this needs to be updated From 9db6fb5692d291a82b9a5a8bc6dcee531e121526 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Sun, 8 Oct 2023 11:07:49 +0200 Subject: [PATCH 3/3] Gitlab: add centos7 image --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c98faed71..69d2b0b41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,7 @@ generate-docs: # these are usually tagged with "cvmfs" tags: - k8s-cvmfs + image: registry.cern.ch/ghcr.io/key4hep/key4hep-images/centos7:latest script: # use a setup that provides all dependencies - if the dependencies change, # this needs to be updated