From 17b76eec24950029dccf111f49ca4414e947bc1c Mon Sep 17 00:00:00 2001
From: Eduardo Trujillo <ed@chromabits.com>
Date: Fri, 23 Dec 2022 16:45:10 -0800
Subject: [PATCH] fix(ci): Try using a bash script for uploading RPMs
---
.gitlab-ci.yml | 5 ++---
.../fedora/rust-nm-reactor.spec | 0
contrib/fedora/upload-rpms.sh | 9 +++++++++
3 files changed, 11 insertions(+), 3 deletions(-)
rename rust-nm-reactor.spec => contrib/fedora/rust-nm-reactor.spec (100%)
create mode 100644 contrib/fedora/upload-rpms.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cd20cf..84eb612 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,9 +121,8 @@ fedora:
script:
- dnf install -y rust cargo rpm-build rpmdevtools rust-packaging dnf-plugins-core curl
- rpmdev-setuptree
- - cp ./rust-nm-reactor.spec ~/rpmbuild/SPECS/
+ - cp ./contrib/fedora/rust-nm-reactor.spec ~/rpmbuild/SPECS/
- spectool -g -R ~/rpmbuild/SPECS/rust-nm-reactor.spec
- dnf builddep -y ~/rpmbuild/SPECS/rust-nm-reactor.spec
- rpmbuild -ba ~/rpmbuild/SPECS/rust-nm-reactor.spec
- - |
- for file in ~/rpmbuild/RPMS/**/*.rpm; do curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${file} ${PACKAGE_REGISTRY_URL}/$(basename $file); done
+ - bash contrib/fedora/upload-rpms.sh
diff --git a/rust-nm-reactor.spec b/contrib/fedora/rust-nm-reactor.spec
similarity index 100%
rename from rust-nm-reactor.spec
rename to contrib/fedora/rust-nm-reactor.spec
diff --git a/contrib/fedora/upload-rpms.sh b/contrib/fedora/upload-rpms.sh
new file mode 100644
index 0000000..7e00536
--- /dev/null
+++ b/contrib/fedora/upload-rpms.sh
@@ -0,0 +1,9 @@
+for file in ~/rpmbuild/RPMS/**/*.rpm
+do
+ curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${file} ${PACKAGE_REGISTRY_URL}/$(basename $file)
+done
+
+for file in ~/rpmbuild/SRPMS/*.rpm
+do
+ curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${file} ${PACKAGE_REGISTRY_URL}/$(basename $file)
+done
--
GitLab