Skip to content

Commit 838e6c2

Browse files
committed
Adding RPM build workflow
1 parent 648b9b0 commit 838e6c2

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

.github/workflows/build-rpm.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@ jobs:
1313
build-rpm:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Build RPM
17-
uses: mmornati/docker-mock-rpmbuilder@master
18-
env:
19-
SPEC_FILE: "rpm/scitokens-cpp.spec"
20-
SOURCES: workspace
21-
MOCK_CONFIG: "epel-7-x86_64"
16+
- uses: actions/checkout@v1
17+
with:
18+
submodules: recursive
19+
20+
# Custom rpm building from Derek to build RPM
21+
- uses: djw8605/docker-mock-rpmbuilder@master
22+
with:
23+
spec-file: rpm/scitokens-cpp.spec
24+
mock-config: epel-7-x86_64
2225

.github/workflows/ccpp.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
submodules: recursive
2424
- name: install deps
2525
run: |
26-
sudo apt-get install libssl-dev sqlite3 libsqlite3-dev cmake libcurl4 libcurl4-openssl-dev uuid-dev
26+
sudo apt update && sudo apt-get install libssl-dev sqlite3 libsqlite3-dev cmake libcurl4 libcurl4-openssl-dev uuid-dev
2727
2828
- name: Create Build Environment
2929
# Some projects don't allow in-source building, so create a separate build directory
@@ -52,3 +52,5 @@ jobs:
5252
# Execute tests defined by the CMake configuration.
5353
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
5454
run: ctest -C $BUILD_TYPE
55+
56+

rpm/scitokens-cpp.spec

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: scitokens-cpp
2-
Version: 0.3.5
2+
Version: 0.4.0
33
Release: 1%{?dist}
44
Summary: C++ Implementation of the SciTokens Library
55
License: ASL 2.0
@@ -18,6 +18,7 @@ Source0: https://github.com/scitokens/scitokens-cpp/releases/download/v%{version
1818
# by this package.
1919

2020
BuildRequires: gcc-c++
21+
BuildRequires: make
2122
BuildRequires: cmake
2223
BuildRequires: sqlite-devel
2324
BuildRequires: openssl-devel
@@ -76,6 +77,9 @@ do_build
7677
%dir %{_includedir}/scitokens
7778

7879
%changelog
80+
* Fri Nov 08 2019 Derek Weitzel <[email protected]> - 0.4.0-1
81+
- Add support for WLCG profile
82+
7983
* Fri Nov 08 2019 Derek Weitzel <[email protected]> - 0.3.5-1
8084
- Fix EC public key handling
8185

0 commit comments

Comments
 (0)