From ebaf0812dd63c8eb9d341236d4772f7227516bb9 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Wed, 30 Aug 2023 12:07:04 +0000
Subject: [PATCH] Unpin DP3 in Docker build
---
.gitlab-ci.yml | 2 --
Docker/fetch_latest_commits.sh | 4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eea5599c..29e90004 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,8 +35,6 @@ versioning:
# Unshallowing ensures that 'git describe' works
- git fetch --unshallow
- ./Docker/fetch_latest_commits.sh | tee commits.txt > versions.env
- # TODO: pinned version for DP3
- - echo DP3_COMMIT=123e194b135efd5fd471ff5817c7af6d1ae48bb8 >> versions.env
- echo LINC_VERSION=$(git describe --tags --always) >> versions.env
# Use hash of commits to determine version of base image (and rebuild if necessary)
- echo INTEGRATION_BASE_IMAGE=${CI_REGISTRY_IMAGE}/integration_base:$(sha256sum commits.txt | cut -d " " -f 1) >> versions.env
diff --git a/Docker/fetch_latest_commits.sh b/Docker/fetch_latest_commits.sh
index ac37783d..101fc136 100755
--- a/Docker/fetch_latest_commits.sh
+++ b/Docker/fetch_latest_commits.sh
@@ -7,7 +7,5 @@ git ls-remote https://gitlab.com/aroffringa/aoflagger.git HEAD | awk '{ pri
git ls-remote https://github.com/nlesc-dirac/sagecal HEAD | awk '{ print "SAGECAL_COMMIT="$1 }'
git ls-remote https://github.com/lofar-astron/LOFARBeam.git HEAD | awk '{ print "LOFARBEAM_COMMIT="$1 }'
git ls-remote https://git.astron.nl/RD/EveryBeam.git HEAD | awk '{ print "EVERYBEAM_COMMIT="$1 }'
-# Fixed version
-#git ls-remote https://git.astron.nl/RD/DP3.git HEAD | awk '{ print "DP3_COMMIT="$1 }'
+git ls-remote https://git.astron.nl/RD/DP3.git HEAD | awk '{ print "DP3_COMMIT="$1 }'
git ls-remote https://gitlab.com/aroffringa/wsclean.git HEAD | awk '{ print "WSCLEAN_COMMIT="$1 }'
-git ls-remote https://git.astron.nl/RD/LSMTool.git HEAD | awk '{ print "LSMTOOL_COMMIT="$1 }'
--
GitLab