Skip to content

Commit

Permalink
Cleaning repository
Browse files Browse the repository at this point in the history
Update github workflows

Update github workflows

Update to v4

rm .githubfiles/dart_experimental_nov22p1.cfg

Update to start the CI-CD every night

Update to start the CI-CD every night

Update to jan24p1

Removed .githubfiles

Added .githubfiles

Changed .githubfiles
  • Loading branch information
jose-luis-rs committed Dec 4, 2024
1 parent f17a9f1 commit 4e0520b
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 46 deletions.
4 changes: 2 additions & 2 deletions .github/actions/cache-save/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
steps:
- name: cache ucesb
id: cache-ucesb
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: |
${{ env.UCESB_DIR }}
Expand All @@ -25,7 +25,7 @@ runs:
- name: cache r3b
if: matrix.save != 'false'
id: cache-r3b
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: .ccache
key: r3b-build-${{ inputs.cache-name }}-${{ inputs.r3b-dev-key }}
10 changes: 5 additions & 5 deletions .github/actions/ctest-cdash/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ runs:
- name: running ctest
run: |
source $GITHUB_WORKSPACE/util/generate_geo_test.sh
ctest -S cmake/CI_CD/CDash.cmake -DBUILD_J=${NUM_THREADS}\
-DTEST_MODEL=${TEST_MODEL}\
-DTEST_NAME=${{ env.TEST_NAME }}\
-DSITE_NAME="Github hosted (${{ github.repository }})"\
-V -E "(run_gen_sim|run_digi|run_aladin_digi|califasim2|landreco|elsim)"
# ctest -S cmake/CI_CD/CDash.cmake -DBUILD_J=${NUM_THREADS}\
# -DTEST_MODEL=${TEST_MODEL}\
# -DTEST_NAME=${{ env.TEST_NAME }}\
# -DSITE_NAME="Github hosted (${{ github.repository }})"\
# -V -E "(run_gen_sim|run_digi|run_aladin_digi|califasim2|landreco|elsim)"
shell: bash
2 changes: 1 addition & 1 deletion .github/actions/install-deps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
- name: cache ucesb
if: github.event_name == 'pull_request'
id: cache-ucesb
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: |
${{ env.UCESB_DIR }}
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/pre-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ runs:
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
echo "UCESB_DIR=$GITHUB_WORKSPACE/ucesb/" >> $GITHUB_ENV
export SIMPATH=${CVMDIR}/debian10/fairsoft/nov22p1
export SIMPATH=${CVMDIR}/debian10/fairsoft/jan24p1
echo "SIMPATH=${SIMPATH}" >> $GITHUB_ENV
echo "FAIRROOTPATH=${CVMDIR}/debian10/fairroot/v18.8.0_fs_nov22p1" >> $GITHUB_ENV
echo "FAIRROOTPATH=${CVMDIR}/debian10/fairroot/v18.8.2_jan24p1" >> $GITHUB_ENV
echo "${SIMPATH}/bin" >> $GITHUB_PATH
# variables for ccache
echo "CCACHE_BASEDIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/first-timer.yml

This file was deleted.

12 changes: 8 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ on:

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
schedule:
- cron: "0 0 * * *" # Runs every night at 00:00 UTC


# A workflow run is made up of one or more jobs that can run sequentially or
# parallelly. As has been specified above, all the jobs below will be
Expand Down Expand Up @@ -61,7 +64,7 @@ jobs:
# tool-kits for the building, such as clang-tidy and cvmfs. For more
# information, please visit the Docker repository at Dockerhub.
container:
image: yanzhaowang/cvmfs_clang:v15
image: yanzhaowang/cvmfs_clang:latest
volumes:
- /tmp:/cvmfs
env:
Expand All @@ -79,7 +82,7 @@ jobs:
# another github repo or a self-defined one in .github/actions.
steps:
# Fetch updates from pull request branches using a public github action.
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# This allows all commits of all branches to be fetched.
fetch-depth: 0
Expand Down Expand Up @@ -118,8 +121,9 @@ jobs:
cd sofia
git clone https://github.com/R3BRootGroup/macros.git
mv sofia/ucesb .
cmake . -B build -C cmake/CI_CD/configure_options.cmake
cmake --build ./build -- -j ${NUM_THREADS}
cmake . -B build -C cmake/CI_CD/configure_options.cmake -DBUILD_GEOMETRY=OFF
cd build
make -j ${NUM_THREADS}
# A self-defined composite action to perform the ctest and push the
# results to the cdash (cmake-dashborad). To fully show the errors and
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Code formatting
run: |
cd $GITHUB_WORKSPACE
Expand Down
8 changes: 0 additions & 8 deletions .githubfiles/dart_experimental_nov22p1.cfg

This file was deleted.

9 changes: 2 additions & 7 deletions apply-format.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
#!/bin/bash

CLANG_FORMAT_BIN="clang-format-15"

FILES=$(find . -type f \( -iname "*.h" ! -iname "*.pb.h" ! -iname "*LinkDef.h" ! -iname "ext_h101_*.h" -o -iname "*.hpp" -o -iname "*.cxx" -o -iname "*.cpp" -o -iname "*.tpl" -o -iname "*.c" -o -iname "*.C" \) -not \( -path "./macros/*" -prune \))

$CLANG_FORMAT_BIN -i $FILES
echo "Clang-format has been applied over all files. Use git add -A ; git commit -m \"clang-format all files\""
find -type f | grep -e '.(\.C\|\.cpp\|\.cxx\|\.h)$' | grep -v ^./macros | xargs -L 1 clang-format-15 -i
echo "Use git add -A ; git commit -m \"clang-format all files\" --author=\"white space <[email protected]>\" to commit changes."

0 comments on commit 4e0520b

Please sign in to comment.