From 0f997ad798359d17ecc86abf67bdbb2a2150dcd7 Mon Sep 17 00:00:00 2001 From: Paul Bauer Date: Mon, 8 Mar 2021 14:16:54 +0100 Subject: [PATCH] Fix copyright check Something got broken while merging 2020 into 2021. --- admin/gitlab-ci/lint.gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/admin/gitlab-ci/lint.gitlab-ci.yml b/admin/gitlab-ci/lint.gitlab-ci.yml index b3a720ace8..23eb084a17 100644 --- a/admin/gitlab-ci/lint.gitlab-ci.yml +++ b/admin/gitlab-ci/lint.gitlab-ci.yml @@ -117,8 +117,7 @@ copyright-check: KUBERNETES_CPU_REQUEST: 1 KUBERNETES_MEMORY_REQUEST: 2Gi script: - # TODO (issue #3272) `master` is not appropriate for use on release-xxxx branches, how should we handle that? - - REV=$(git fetch -q https://gitlab.com/gromacs/gromacs.git master && git show -s --pretty=format:"%h" `git merge-base FETCH_HEAD HEAD`) + - REV=$(git fetch -q https://gitlab.com/gromacs/gromacs.git release-2021 && git show -s --pretty=format:"%h" `git merge-base FETCH_HEAD HEAD`) - HEAD_REV=$(git show -s --pretty=format:"%h" HEAD) - if [[ "$REV" == "$HEAD_REV" ]] ; then REV="HEAD~1" ; -- 2.22.0