Skip to content

Commit

Permalink
fix(ci): replace : by - (and many changed lines)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wdconinc
wdconinc committed Jan 4, 2024
1 parent 3bf43a6 commit 69ac9bd
Showing 1 changed file with 36 additions and 30 deletions.
66 changes: 36 additions & 30 deletions .github/workflows/linux-eic-shell.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@ on:
merge_group:
workflow_dispatch:
inputs:
platform-release:
description: 'eic-shell version'
default: 'jug_xl:nightly'
platform:
description: 'eic-shell platform'
default: 'jug_xl'
required: false
type: string
release:
description: 'eic-shell release'
default: 'nightly'
required: false
type: string
detector-version:
Expand All @@ -27,7 +32,8 @@ concurrency:
cancel-in-progress: true

env:
platform-release: ${{ inputs.platform-release || 'jug_xl:nightly' }}
platform: ${{ inputs.platform || 'jug_xl' }}
release: ${{ inputs.release || '23.12-alpha' }}
detector-version: ${{ inputs.detector-version || 'main' }}
clang-tidy-iwyu-CC: clang
clang-tidy-iwyu-CMAKE_BUILD_TYPE: Debug
Expand Down Expand Up @@ -57,11 +63,11 @@ jobs:
- CC: clang
CXX: clang++
CMAKE_BUILD_TYPE: Release
platform-release: jug_xl:nightly
release: nightly
- CC: clang
CXX: clang++
CMAKE_BUILD_TYPE: Release
platform-release: jug_xl:23.12-alpha
release: 23.12-alpha
steps:
- uses: actions/checkout@v3
- name: Prepare ccache timestamp
Expand Down Expand Up @@ -90,7 +96,7 @@ jobs:
- name: Build and install
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ matrix.release || env.release }}"
run: |
# install this repo
CC="${{ matrix.CC }}" CXX="${{ matrix.CXX }}" CXXFLAGS="${{ matrix.CXXFLAGS }}" cmake -B build -S . -DCMAKE_INSTALL_PREFIX=install -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=${{ matrix.CMAKE_BUILD_TYPE }} -DUSE_ASAN=ON -DUSE_TSAN=OFF -DUSE_UBSAN=ON
Expand All @@ -99,7 +105,7 @@ jobs:
- name: Check dynamic library loader paths
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ matrix.platform-release || env.platform-release }}"
platform-release: "${{ env.platform }}:${{ matrix.release || env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH
Expand All @@ -110,7 +116,7 @@ jobs:
- name: Run testsuite
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ matrix.release || env.release }}"
run: |
export LD_LIBRARY_PATH=$PWD/install/lib:$LD_LIBRARY_PATH
ctest --test-dir build -V
Expand All @@ -119,7 +125,7 @@ jobs:
- name: Upload install directory
uses: actions/upload-artifact@v3
with:
name: install-${{ matrix.CC }}-eic-shell-${{ matrix.CMAKE_BUILD_TYPE }}-${{ matrix.platform-release || env.platform-release }}
name: install-${{ matrix.CC }}-eic-shell-${{ matrix.CMAKE_BUILD_TYPE }}-${{ env.platform }}-${{ matrix.release || env.release }}$
path: install.tar.zst
if-no-files-found: error
# Only compress and upload build directory if we are going to use it later
Expand All @@ -130,7 +136,7 @@ jobs:
if: matrix.CC == env.clang-tidy-iwyu-CC && matrix.CMAKE_BUILD_TYPE == env.clang-tidy-iwyu-CMAKE_BUILD_TYPE
uses: actions/upload-artifact@v3
with:
name: build-${{ matrix.CC }}-eic-shell-${{ matrix.CMAKE_BUILD_TYPE }}-${{ matrix.platform-release || env.platform-release }}
name: build-${{ matrix.CC }}-eic-shell-${{ matrix.CMAKE_BUILD_TYPE }}-${{ env.platform }}-${{ matrix.release || env.release }}
path: build.tar.zst
if-no-files-found: error

Expand All @@ -154,14 +160,14 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: ${{ github.event_name == 'pull_request' }}
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
run: |
git diff ${{github.event.pull_request.base.sha}} ${{ github.event.pull_request.base.sha }} | clang-tidy-diff -p 1 -path build -quiet -export-fixes clang_tidy_fixes.yml -extra-arg='-std=c++20' -checks='-*,bugprone-*,-bugprone-narrowing-conversions' -clang-tidy-binary run-clang-tidy
- name: Run clang-tidy on all files
uses: eic/run-cvmfs-osg-eic-shell@main
if: ${{ github.event_name == 'push' }}
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
run: |
run-clang-tidy -p build -export-fixes clang_tidy_fixes.yml -extra-arg='-std=c++20'
- name: Upload clang-tidy fixes as artifact
Expand All @@ -182,7 +188,7 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: ${{ github.event_name == 'pull_request' }}
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
run: |
# reduce headers until diff is stable
while [[ ${sha:-} != $(git diff | sha256sum) ]] ; do
Expand All @@ -196,7 +202,7 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: ${{ github.event_name == 'push' }}
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
run: |
# don't aim for stability for all files
iwyu_tool.py -p build -- -Xiwyu --verbose=3 -Xiwyu --no_fwd_decls -Xiwyu --cxx17ns -Xiwyu --mapping_file=${{github.workspace}}/.github/iwyu.imp -Xiwyu --regex=ecmascript | tee iwyu_fixes.log
Expand Down Expand Up @@ -290,7 +296,7 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: steps.retrieve_simulation_files.outputs.cache-hit != 'true'
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
npsim --compactFile ${DETECTOR_PATH}/${DETECTOR}_${{ matrix.detector_config }}.xml -G --random.seed 1 --gun.particle "${{ matrix.particle }}-" --gun.momentumMin "1*GeV" --gun.momentumMax "20*GeV" --gun.distribution "uniform" -N 100 --outputFile sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root -v WARNING
Expand Down Expand Up @@ -323,7 +329,7 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: steps.retrieve_simulation_files.outputs.cache-hit != 'true'
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
python src/tests/LUMISPECCAL_test/TwoElectronsTopCAL.py genParticles.hepmc
Expand Down Expand Up @@ -360,7 +366,7 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: steps.retrieve_simulation_files.outputs.cache-hit != 'true'
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
url=root://dtn-eic.jlab.org//work/eic2/EPIC/EVGEN/DIS/NC/${{matrix.beam}}/minQ2=${{matrix.minq2}}/pythia8NCDIS_${{matrix.beam}}_minQ2=${{matrix.minq2}}_beamEffects_xAngle=-0.025_hiDiv_1.hepmc3.tree.root
Expand Down Expand Up @@ -401,7 +407,7 @@ jobs:
- name: Run EICrecon (digitization)
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
export DETECTOR_CONFIG=${DETECTOR}_${{ matrix.detector_config }}
Expand All @@ -417,7 +423,7 @@ jobs:
- name: Run EICrecon (reconstruction)
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
export DETECTOR_CONFIG=${DETECTOR}_${{ matrix.detector_config }}
Expand Down Expand Up @@ -459,7 +465,7 @@ jobs:
- name: Run EICrecon
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
export DETECTOR_CONFIG=${DETECTOR}_${{ matrix.detector_config }}
Expand Down Expand Up @@ -506,7 +512,7 @@ jobs:
- name: Run EICrecon
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
export DETECTOR_CONFIG=${DETECTOR}_${{ matrix.detector_config }}
Expand Down Expand Up @@ -547,15 +553,15 @@ jobs:
- name: Check dynamic library loader paths
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
export LD_LIBRARY_PATH=$PWD/install/lib:$LD_LIBRARY_PATH
ldd -r install/lib/*.so install/lib/EICrecon/plugins/*.so
- name: Run EICrecon
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
export DETECTOR_CONFIG=${DETECTOR}_${{ matrix.detector_config }}
Expand Down Expand Up @@ -594,7 +600,7 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: steps.download_previous_artifact.outputs.found_artifact == 'true'
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
pip install 'pygithub>=2' 'bokeh>=3'
Expand Down Expand Up @@ -628,7 +634,7 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: steps.download_previous_artifact.outputs.found_artifact == 'true'
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
echo "::group::pip install"
Expand Down Expand Up @@ -666,7 +672,7 @@ jobs:
- name: Run EICrecon
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
export DETECTOR_CONFIG=${DETECTOR}_${{ matrix.detector_config }}
Expand Down Expand Up @@ -721,7 +727,7 @@ jobs:
- name: Run EICrecon
uses: eic/run-cvmfs-osg-eic-shell@main
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
export DETECTOR_CONFIG=${DETECTOR}_${{ matrix.detector_config }}
Expand Down Expand Up @@ -755,7 +761,7 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: steps.download_previous_artifact.outputs.found_artifact == 'true'
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
pip install 'pygithub>=2' 'bokeh>=3'
Expand Down Expand Up @@ -789,7 +795,7 @@ jobs:
uses: eic/run-cvmfs-osg-eic-shell@main
if: steps.download_previous_artifact.outputs.found_artifact == 'true'
with:
platform-release: "${{ env.platform-release }}"
platform-release: "${{ env.platform }}:${{ env.release }}"
setup: "/opt/detector/epic-${{ env.detector-version }}/setup.sh"
run: |
echo "::group::pip install"
Expand Down

0 comments on commit 69ac9bd

Please sign in to comment.