From 76776579690f062633ff0e41bdab6eadcadc02b8 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sun, 10 Mar 2019 06:31:23 +0900
Subject: [PATCH] CI job
---
.gitlab-ci.yml | 6 +++---
scripts/package | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1036bcf..7a024b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,12 +24,12 @@ fedora_rpm:
- ./scripts/package fedora_rpm
artifacts:
paths:
- - build_*/ocs-url*.rpm
+ - build_*/RPMS/x86_64/ocs-url*.rpm
expire_in: 2 days
opensuse_rpm:
stage: build
- image: opensuse:42.1
+ image: opensuse:42.3
only:
- master
- /^release\-.+/
@@ -37,7 +37,7 @@ opensuse_rpm:
- ./scripts/package opensuse_rpm
artifacts:
paths:
- - build_*/ocs-url*.rpm
+ - build_*/RPMS/x86_64/ocs-url*.rpm
expire_in: 2 days
archlinux_pkg:
diff --git a/scripts/package b/scripts/package
index 00f4c4e..a92f8c7 100755
--- a/scripts/package
+++ b/scripts/package
@@ -55,7 +55,7 @@ build_fedora_rpm() {
rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec"
}
-opensuse_rpm() { # docker-image: opensuse:42.1
+opensuse_rpm() { # docker-image: opensuse:42.3
install_build_deps_opensuse_rpm
add_pkguser
su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_opensuse_rpm" ${PKGUSER}
--
GitLab