diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65824e7f56..08bb12c537 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -949,7 +949,7 @@ include: file: flatpak/flatpak_ci_initiative.yml #flatpak_ci_initiative.yml is extremely pervasive. See: https://gitlab.gnome.org/GNOME/citemplates/-/issues/35 #keep 'ref:' synced with submission section of build/linux/flatpak/3_dist-gimp-flatpakbuilder.sh - ref: 42fbc2526a7680b6a4f284a210e63e3973ea6dae + ref: b8e6f8f5a6d2f39b2852d165cc2ab3550ac9e3fb dist-flatpak-weekly: extends: diff --git a/build/linux/flatpak/3_dist-gimp-flatpakbuilder.sh b/build/linux/flatpak/3_dist-gimp-flatpakbuilder.sh index 2d0111d3de..cf7c9575b5 100644 --- a/build/linux/flatpak/3_dist-gimp-flatpakbuilder.sh +++ b/build/linux/flatpak/3_dist-gimp-flatpakbuilder.sh @@ -95,8 +95,8 @@ fi # We take the commands from 'flatpak_ci_initiative.yml' if [ "$GITLAB_CI" ] && [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then printf "\e[0Ksection_start:`date +%s`:${FLATPAK}_submission[collapsed=true]\r\e[0KPublishing $ARCH repo to GNOME nightly\n" - curl https://gitlab.gnome.org/GNOME/citemplates/-/raw/42fbc2526a7680b6a4f284a210e63e3973ea6dae/flatpak/flatpak_ci_initiative.yml --output flatpak_ci_initiative.yml - eval "$(sed -n '/flatpak build-update-repo/,/purge/ { s/^ - //; p; }' flatpak_ci_initiative.yml)" + curl https://gitlab.gnome.org/GNOME/citemplates/-/raw/b8e6f8f5a6d2f39b2852d165cc2ab3550ac9e3fb/flatpak/flatpak_ci_initiative.yml --output flatpak_ci_initiative.yml + eval "$(sed -n '/BUILD_ID=/,/purge/ { s/^ - //; p; }' flatpak_ci_initiative.yml)" printf "\e[0Ksection_end:`date +%s`:${FLATPAK}_submission\r\e[0K\n" fi done