From 190bcf240d06c07a2e63c2dd2eba1898516bc9b9 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Fri, 24 Aug 2018 12:43:11 +0000 Subject: [PATCH] CI: Give up on fancy artifact name While the artifact has the correct name, the review url is messed up and the env variable is never resolved. Previously urls look like so: "/artifacts/raw/org.gnome.Fractal.${CI_COMMIT_SHA}.flatpak" I am tired of fighting yaml to get this to work. --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0657daae..c4005384 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - deploy variables: - BUNDLE: "org.gnome.FractalDevel.${CI_COMMIT_SHA}.flatpak" + BUNDLE: "org.gnome.FractalDevel.flatpak" MANIFEST_PATH: "flatpak/org.gnome.Fractal.json" MANIFEST_PATH: "flatpak/org.gnome.Fractal.json" FLATPAK_MODULE: "fractal" @@ -48,7 +48,7 @@ flatpak: artifacts: paths: - - $BUNDLE + - "${BUNDLE}" expire_in: 2 days <<: *flatpak_cache @@ -61,11 +61,11 @@ review: - echo "Generating flatpak deployment" artifacts: paths: - - $BUNDLE + - "${BUNDLE}" expire_in: 30 days environment: - name: review/$CI_COMMIT_REF_NAME - url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE} + name: "review/${CI_COMMIT_REF_NAME}" + url: "https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE}" on_stop: stop_review except: - master@World/fractal @@ -77,7 +77,7 @@ stop_review: - echo "Stopping flatpak deployment" when: manual environment: - name: review/$CI_COMMIT_REF_NAME + name: "review/${CI_COMMIT_REF_NAME}" action: stop except: - master@World/fractal