diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2019-11-28 07:52:21 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2019-11-28 05:00:26 +0000 |
| commit | 68241254123d401c31d8d0a6a8fd29661eba0e2f (patch) | |
| tree | 6781b5884c4787de5cedd8c977e3a3549cea8dbf | |
| parent | caa3ea7801967297cae552092eda81e259e8d789 (diff) | |
gitlab CI: use multiple extends for the default artifact/build snippets
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce9435fb..d68c7219 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,7 +112,7 @@ variables: # cancel run when a newer version is pushed to the branch interruptible: true -.default_artifacts: &default_artifacts +.default_artifacts: artifacts: name: "meson-logs-$CI_JOB_NAME" when: always @@ -121,7 +121,7 @@ variables: - $MESON_BUILDDIR/meson-logs # The default build instructions -.default_build: &default_build +.default_build: script: - rm -rf "$MESON_BUILDDIR" - meson "$MESON_BUILDDIR" $MESON_ARGS @@ -433,9 +433,9 @@ freebsd:11.2@container-clean: .build@template: extends: - .policy + - .default_artifacts + - .default_build stage: build - <<: *default_artifacts - <<: *default_build dependencies: [] # |