diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eea5599cb684cd01f108b5c713dd4c10785ed7d0..29e90004a73d54964aeb5ed8aa847fd169e4e0ba 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 ac37783d637a64e2b4036b9c34e716fdb96ade19..101fc136281229f0c7f3dc69df069baa5e088365 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 }'