[nautilus/wip/oholy/ci-buildah] fix
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/oholy/ci-buildah] fix
- Date: Fri, 20 Nov 2020 07:33:18 +0000 (UTC)
commit 7de428c0cc298d52ae95f5289c904dcd56288a44
Author: Ondrej Holy <oholy redhat com>
Date: Thu Nov 19 11:31:33 2020 +0100
fix
.gitlab-ci.yml | 6 ++++--
.gitlab/Dockerfile | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 726dbb724..a7270d364 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,9 @@ nightly:
- 'flatpak devel'
fedora rawhide:
- image: registry.gitlab.gnome.org/gnome/nautilus:latest
+ image:
+ name: registry.gitlab.gnome.org/gnome/nautilus:latest
+ entrypoint: ["/bin/sh", "-c"]
stage: cross environment
script:
- meson _build .
@@ -35,7 +37,6 @@ fedora rawhide:
#only:
#- web
#- master
- when: manual
allow_failure: true
flatpak master:
@@ -83,6 +84,7 @@ update image:
- buildah tag $CI_REGISTRY_IMAGE "$CI_REGISTRY_IMAGE:v$CI_JOB_ID"
- buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- buildah push $CI_REGISTRY_IMAGE
+ - buildah push "$CI_REGISTRY_IMAGE:v$CI_JOB_ID"
#when: manual
#only:
#- web
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 4a0f73b8d..ea2055a52 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:rawhide
+FROM fedora:latest
RUN dnf install --nogpg -y dnf-plugins-core uncrustify findutils git libportal-devel tracker3-miners
python3-gobject dbus-daemon \
&& dnf builddep --nogpg -y nautilus \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]