From 6bbcc295bd4b08efb436a2db2b8c712ff9610fe9 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 19 Sep 2018 19:46:25 +0100 Subject: ci: correctly build to use python3 For a "normal" build running flatpak-builder to completion, the 'build-options: env: PYTHON: /usr/bin/python3' specified at the top level of org.gnome.dfeet.json takes effect. However, the .gitlab-ci.yml (lifted from other projects) uses --stop-at to build everything except d-feet with flatpak-builder, then runs the steps to build d-feet by hand. The PYTHON environment variable does not persist from the earlier steps. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9b8daf..d746aa7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ flatpak: MANIFEST_PATH: "org.gnome.dfeet.json" RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo" FLATPAK_MODULE: "d-feet" - CONFIGURE_ARGS: "--disable-tests" + CONFIGURE_ARGS: "PYTHON=/usr/bin/python3 --disable-tests" DBUS_ID: "org.gnome.dfeet" script: -- cgit v1.2.1