Skip to content

Commit 0c13fc5

Browse files
committed
Merge remote-tracking branch 'upstream/master' into sofie-keras-parser
2 parents 9e87376 + ee08f36 commit 0c13fc5

File tree

10,268 files changed

+1225555
-529904
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

10,268 files changed

+1225555
-529904
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ interpreter/cling/tools/packaging @vgvassilev
4242
/tree/readspeed/ @martamaja10
4343
/tree/ntuple/ @jblomer
4444
/tree/ntuplebrowse/ @jblomer
45-
/tree/ntupleutil/v7/ @jblomer
45+
/tree/ntupleutil/ @jblomer
4646
/tutorials/sql/ @linev
4747

4848
# Projects that span over several code modules:

.github/workflows/python_wheel_build.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,21 @@ on:
1313
pull_request:
1414
types: [labeled]
1515

16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
18+
cancel-in-progress: true
19+
1620
jobs:
1721
build-wheels:
1822
if: |
19-
github.event_name == 'schedule' ||
20-
github.event_name == 'workflow_dispatch' ||
23+
(github.repository_owner == 'root-project' &&
24+
(github.event_name == 'schedule' ||
25+
github.event_name == 'workflow_dispatch')) ||
2126
contains(github.event.pull_request.labels.*.name, 'build-python-wheels')
2227
runs-on: ubuntu-latest
2328
strategy:
2429
matrix:
25-
target: [cp38-manylinux_x86_64, cp39-manylinux_x86_64, cp310-manylinux_x86_64, cp311-manylinux_x86_64, cp312-manylinux_x86_64, cp313-manylinux_x86_64]
30+
target: [cp39-manylinux_x86_64, cp310-manylinux_x86_64, cp311-manylinux_x86_64, cp312-manylinux_x86_64, cp313-manylinux_x86_64]
2631
name: ${{ matrix.target }}
2732
steps:
2833
- uses: actions/checkout@v4

.github/workflows/root-638.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
2+
name: 'ROOT 6.38'
3+
4+
on:
5+
schedule:
6+
- cron: '01 0 * * *'
7+
8+
workflow_dispatch:
9+
inputs:
10+
incremental:
11+
description: 'Do incremental build'
12+
type: boolean
13+
required: true
14+
default: true
15+
binaries:
16+
description: Create binary packages and upload them as artifacts
17+
type: boolean
18+
required: true
19+
default: false
20+
buildtype:
21+
description: The CMAKE_BUILD_TYPE to use for non-Windows.
22+
type: choice
23+
options:
24+
- Debug
25+
- RelWithDebInfo
26+
- Release
27+
- MinSizeRel
28+
default: Debug
29+
required: true
30+
31+
jobs:
32+
run_nightlies:
33+
uses: root-project/root/.github/workflows/root-ci.yml@v6-38-00-patches
34+
secrets: inherit
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CMAKE_CXX_STANDARD=23
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
builtin_zlib=ON
22
builtin_zstd=ON
3+
experimental_adaptivecpp=ON
4+
experimental_genvectorx=ON
35
pythia8=ON
46
vdt=OFF

.github/workflows/root-ci-config/buildconfig/fedora43.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
CMAKE_CXX_STANDARD=23
12
builtin_zlib=ON
23
builtin_zstd=ON
4+
experimental_adaptivecpp=ON
35
pythia8=ON
46
test_distrdf_dask=OFF
57
test_distrdf_pyspark=OFF

.github/workflows/root-ci-config/buildconfig/mac-beta.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CMAKE_BUILD_RPATH=/usr/local/lib
2+
CMAKE_CXX_STANDARD=23
23
builtin_cfitsio=ON
34
builtin_cppzmq=ON
45
builtin_davix=ON
@@ -22,6 +23,7 @@ builtin_xrootd=ON
2223
builtin_xxhash=ON
2324
builtin_zeromq=ON
2425
builtin_zstd=ON
26+
check_connection=ON
2527
cocoa=ON
2628
minuit2_omp=OFF
2729
test_distrdf_dask=ON

.github/workflows/root-ci-config/buildconfig/mac13.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/root-ci-config/buildconfig/mac15.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ builtin_openssl=ON
1616
builtin_pcre=ON
1717
builtin_tbb=ON
1818
builtin_unuran=ON
19-
builtin_vc=ON
2019
builtin_vdt=ON
2120
builtin_veccore=ON
2221
builtin_xrootd=ON
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
CMAKE_BUILD_RPATH=/usr/local/lib
2+
CMAKE_CXX_STANDARD=23
3+
builtin_cfitsio=ON
4+
builtin_cppzmq=ON
5+
builtin_davix=ON
6+
builtin_fftw3=ON
7+
builtin_freetype=ON
8+
builtin_ftgl=ON
9+
builtin_gl2ps=ON
10+
builtin_glew=ON
11+
builtin_gsl=ON
12+
builtin_gtest=ON
13+
builtin_lz4=ON
14+
builtin_lzma=ON
15+
builtin_nlohmannjson=ON
16+
builtin_openssl=ON
17+
builtin_pcre=ON
18+
builtin_tbb=ON
19+
builtin_unuran=ON
20+
builtin_vdt=ON
21+
builtin_veccore=ON
22+
builtin_xrootd=ON
23+
builtin_xxhash=ON
24+
builtin_zeromq=ON
25+
builtin_zstd=ON
26+
check_connection=ON
27+
cocoa=ON
28+
minuit2_omp=OFF
29+
test_distrdf_dask=ON
30+
test_distrdf_pyspark=ON
31+
x11=OFF

0 commit comments

Comments
 (0)