Skip to content

Commit

Permalink
update build
Browse files Browse the repository at this point in the history
  • Loading branch information
guyzsarun committed Sep 20, 2023
1 parent 5a4b8e2 commit 5808fb0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
jobs:
build:
strategy:
fail-fast: false
matrix:
version: ["almalinux:8", "almalinux:9"]
runs-on: ubuntu-latest
Expand Down
9 changes: 2 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,10 @@ find_package( Xrootd REQUIRED )
find_package( XercesC REQUIRED )
find_package( Pcre REQUIRED )
find_package( Jsoncpp REQUIRED )
set (CMAKE_CXX_STANDARD 11)

if( CMAKE_COMPILER_IS_GNUCXX )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror" )
endif()
set (CMAKE_CXX_STANDARD 11)

if( CMAKE_COMPILER_IS_GNUCC )
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror" )
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )

include_directories( "${PROJECT_SOURCE_DIR}" "${XROOTD_INCLUDES}" "${XERCES_INCLUDES}" "${PCRE_INCLUDES}" "${JSONCPP_INCLUDES}")

Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile.rpm
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ RUN yum install -y --enablerepo=osg-contrib \
jsoncpp \
jsoncpp-devel

RUN pip3 install pytest

COPY . .

# RUN mkdir -p /root/rpmbuild/SOURCES
Expand Down

0 comments on commit 5808fb0

Please sign in to comment.