Perform rebase in the pipeline

athena_ci/athena_build.sh

@@ -34,6 +34,8 @@ function heading() {
 
 set -e
 
+BUILD_DIR=${PWD}
+
 heading "Preliminary setup"
 
 if [ -z "${ATHENA_SOURCE}" ]; then
@@ -94,10 +96,17 @@ lsetup "views ${LCG_RELEASE} ${LCG_PLATFORM}" || true
 CCACHE=$(command -v ccache)
 $CCACHE -z
 
+heading "Rebase the GeoModel code base w.r.t. main"
+
+cd ${CI_PROJECT_DIR}
+git getch origin
+git rebase origin/main
+
+cd ${BUILD_DIR}
+
 heading "Configure GeoModel"
 
 gm_install_dir=$PWD/geomodel-install
-
 cmake -S "${SCRIPT_DIR}/.." -B geomodel-build \
   -GNinja \
   -DCMAKE_MAKE_PROGRAM="$NINJA" \