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.
This commit is contained in:
Jordan Petridis 2018-08-24 12:43:11 +00:00 committed by Jordan Petridis
parent 9c07d6a7e6
commit 190bcf240d
No known key found for this signature in database
GPG key ID: E8523968931763BE

View file

@ -4,7 +4,7 @@ stages:
- deploy - deploy
variables: 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"
MANIFEST_PATH: "flatpak/org.gnome.Fractal.json" MANIFEST_PATH: "flatpak/org.gnome.Fractal.json"
FLATPAK_MODULE: "fractal" FLATPAK_MODULE: "fractal"
@ -48,7 +48,7 @@ flatpak:
artifacts: artifacts:
paths: paths:
- $BUNDLE - "${BUNDLE}"
expire_in: 2 days expire_in: 2 days
<<: *flatpak_cache <<: *flatpak_cache
@ -61,11 +61,11 @@ review:
- echo "Generating flatpak deployment" - echo "Generating flatpak deployment"
artifacts: artifacts:
paths: paths:
- $BUNDLE - "${BUNDLE}"
expire_in: 30 days expire_in: 30 days
environment: environment:
name: review/$CI_COMMIT_REF_NAME name: "review/${CI_COMMIT_REF_NAME}"
url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE} url: "https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE}"
on_stop: stop_review on_stop: stop_review
except: except:
- master@World/fractal - master@World/fractal
@ -77,7 +77,7 @@ stop_review:
- echo "Stopping flatpak deployment" - echo "Stopping flatpak deployment"
when: manual when: manual
environment: environment:
name: review/$CI_COMMIT_REF_NAME name: "review/${CI_COMMIT_REF_NAME}"
action: stop action: stop
except: except:
- master@World/fractal - master@World/fractal