Commit 5c72a8a6 authored by Jordan Petridis's avatar Jordan Petridis 🌱

CI: Minor improvements

Reduce the lifetime of the flatpak job artifacts, this does not affect
the review artifacts.

Do not spin up gitlab environments when they are not needed

Switch the flatpak images to the new one,
nightly-oci has been deprecated
parent 1c3cf4ee
Pipeline #24420 passed with stages
in 12 minutes and 35 seconds
...@@ -7,7 +7,7 @@ variables: ...@@ -7,7 +7,7 @@ variables:
BUNDLE: "retro-demo-samples-test-git.flatpak" BUNDLE: "retro-demo-samples-test-git.flatpak"
flatpak:tests: flatpak:tests:
image: registry.gitlab.gnome.org/gnome/gnome-nightly-oci/nightly:master image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
stage: test stage: test
variables: variables:
MANIFEST_PATH: "flatpak/org.gnome.Retro.UnitTests.json" MANIFEST_PATH: "flatpak/org.gnome.Retro.UnitTests.json"
...@@ -25,7 +25,7 @@ flatpak:tests: ...@@ -25,7 +25,7 @@ flatpak:tests:
- .flatpak-builder/cache/ - .flatpak-builder/cache/
flatpak:demo: flatpak:demo:
image: registry.gitlab.gnome.org/gnome/gnome-nightly-oci/nightly:master image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
stage: build stage: build
variables: variables:
MANIFEST_PATH: "flatpak/org.gnome.Retro.DemoSamplesTest.json" MANIFEST_PATH: "flatpak/org.gnome.Retro.DemoSamplesTest.json"
...@@ -43,7 +43,7 @@ flatpak:demo: ...@@ -43,7 +43,7 @@ flatpak:demo:
paths: paths:
- ${BUNDLE} - ${BUNDLE}
- _build/meson-logs/meson-log.txt - _build/meson-logs/meson-log.txt
expire_in: 30 days expire_in: 2 days
cache: cache:
paths: paths:
- .flatpak-builder/cache/ - .flatpak-builder/cache/
...@@ -63,6 +63,10 @@ review: ...@@ -63,6 +63,10 @@ review:
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:
- master@GNOME/retro-gtk
- gnome-3-.*
- tags
stop_review: stop_review:
stage: review stage: review
...@@ -72,3 +76,7 @@ stop_review: ...@@ -72,3 +76,7 @@ stop_review:
environment: environment:
name: review/$CI_COMMIT_REF_NAME name: review/$CI_COMMIT_REF_NAME
action: stop action: stop
except:
- master@GNOME/retro-gtk
- gnome-3-.*
- tags
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment