Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI workflows #965

Merged
merged 8 commits into from
Jun 6, 2024
Merged

Update CI workflows #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5cb588
add cvmfs jobs with el9 arch
May 30, 2024
9fcb0cf
fix matrix strategy
May 30, 2024
df905c0
fix matrix strategy
May 30, 2024
d43c9c1
add root v6.32 version, fix 6.22
May 30, 2024
1d7d1b8
fix 6.22
May 30, 2024
56711f2
Update ci.yml
anigamova May 30, 2024
53c0ef0
remove 6.32 build for now
anigamova May 30, 2024
034cb93
Update ci.yml
anigamova May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,18 @@ jobs:
strategy:
matrix:
python: ["3.8"]
root: ["6.22"]
root: ["6.22"]
include:
# to deprecate (11_2_X py2)
- python: "2.7.18"
root: "6.22.0"
# python 3.9 root 6.24 (12_3_X)
- python: "3.9"
root: "6.24"
root: "6.22.0"
# python 3.10 root 6.26
- python: "3.10"
root: "6.26.4"
# python 3.10 root 6.32 (not available yet)
#- python: "3.10"
# root: "6.32" # version 6.30.07 where the conflicting classes were removed from root is not available, so compiling with 6.32.00 where this issue is resolved

runs-on: ubuntu-latest
name: Compile (py${{ matrix.python }}, root${{ matrix.root }})

Expand Down
25 changes: 17 additions & 8 deletions .github/workflows/cvmfs-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
name: CI with CVMFS

env:
IMAGE: cmscloud/cc7-cms
CMSSW_VERSION: CMSSW_11_3_4
SCRAM_ARCH: slc7_amd64_gcc900

on:
workflow_dispatch:
pull_request:
Expand All @@ -15,7 +10,20 @@ on:
jobs:
test_workflow:
runs-on: ubuntu-latest
name: Test with CMSSW
strategy:
matrix:
IMAGE: ["cmscloud/al9-cms"]
CMSSW_VERSION: ["CMSSW_14_1_0_pre4"] # ROOT v6.30/07
SCRAM_ARCH: ["el9_amd64_gcc12"]
include:
- IMAGE: "cmscloud/cc7-cms"
CMSSW_VERSION: "CMSSW_11_3_4" # ROOT v6.22
SCRAM_ARCH: "slc7_amd64_gcc900"
- IMAGE: "cmscloud/al9-cms"
CMSSW_VERSION: "CMSSW_14_0_0_pre1" # ROOT v6.26/11
SCRAM_ARCH: "el9_amd64_gcc12"

name: Test with ${{ matrix.CMSSW_VERSION }}
steps:
# checkout the files of this repository
- uses: actions/checkout@v4
Expand All @@ -24,9 +32,9 @@ jobs:
cvmfs_repositories: 'cms.cern.ch'
- uses: rhaschke/docker-run-action@v5
with:
image: ${{ env.IMAGE }}
image: ${{ matrix.IMAGE }}
shell: bash
options: -v /cvmfs:/cvmfs:shared -v ${{ github.workspace }}:/work/CombinedLimit -w /home/cmsusr -e CMSSW_VERSION=${{ env.CMSSW_VERSION }} -e SCRAM_ARCH=${{ env.SCRAM_ARCH }}
options: -v /cvmfs:/cvmfs:shared -v ${{ github.workspace }}:/work/CombinedLimit -w /home/cmsusr -e CMSSW_VERSION=${{ matrix.CMSSW_VERSION }} -e SCRAM_ARCH=${{ matrix.SCRAM_ARCH }}
run: |
ls /work/CombinedLimit
ls /cvmfs/cms.cern.ch | grep common
Expand All @@ -39,6 +47,7 @@ jobs:
cp -r /work/CombinedLimit HiggsAnalysis/
scramv1 b -j$(nproc)
echo ${PATH}
root --version
combine --help
combine HiggsAnalysis/CombinedLimit/data/tutorials/CAT23001/datacard-2-template-analysis.txt -M HybridNew --LHCmode LHC-limits --rMax 2.0 --clsAcc 0.01
combine HiggsAnalysis/CombinedLimit/data/tutorials/CAT23001/datacard-3-parametric-analysis.txt -M HybridNew --LHCmode LHC-significance -T 100 --mass 125
Expand Down
Loading