Skip to content

Commit 1f20f28

Browse files
committed
Remove test on Julia nightly and attempt to fix test on MacOS
Test with Julia nightly removed because it fails to often.
1 parent c7b7823 commit 1f20f28

File tree

4 files changed

+32
-8
lines changed

4 files changed

+32
-8
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
using Pkg
2+
Pkg.activate(temp=true)
3+
Pkg.add("Conda")
4+
import Conda
5+
Conda.add("root=6.32.8")
6+
print("`\n", joinpath(Conda.ROOTENV, "bin"))

.github/workflows/test-linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
matrix:
1919
version:
2020
- '1.10'
21-
- 'nightly'
2221
os:
2322
- ubuntu-latest
2423
# - macOS-latest

.github/workflows/test-macos.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
defaults:
99
run:
10-
shell: bash
10+
shell: bash -l {0}
1111

1212
jobs:
1313
test:
@@ -18,12 +18,11 @@ jobs:
1818
matrix:
1919
version:
2020
- '1.10'
21-
- 'nightly'
2221
os:
2322
# - ubuntu-latest
2423
- macOS-latest
2524
arch:
26-
- x64
25+
- aarch64
2726
steps:
2827
- uses: actions/checkout@v3
2928
with:
@@ -32,5 +31,25 @@ jobs:
3231
with:
3332
version: ${{ matrix.version }}
3433
arch: ${{ matrix.arch }}
35-
- uses: julia-actions/julia-buildpkg@latest
34+
- name: Install ROOT
35+
run: |
36+
CONDA_BINDIR="`julia .github/workflows/install_root_macos.jl | tail -n 1`"
37+
source "$CONDA_BINDIR/activate"
38+
cat >> "$GITHUB_ENV" <<EOF
39+
export LDFLAGS="$LDFLAGS"
40+
export CPPFLAGS="$CPPFLAGS"
41+
export LIBTOOL="$LIBTOOL"
42+
export CXXFLAGS="$CXXFLAGS"
43+
export CPP="$CPP"
44+
export PATH="$PATH"
45+
export LD="$LD"
46+
export CXX="$CXX"
47+
export CFLAGS="$CFLAGS"
48+
export CC="$CC"
49+
EOF
50+
echo -n "ROOT binary: " 1>&2
51+
which root 1>&2
52+
- name: Build the Julia wrapper library
53+
run: julia --project=@. -e 'import Pkg; Pkg.add("ROOTprefs"); using ROOTprefs; set_use_root_jll(false); set_ROOTSYS(); import ROOT' 1>&2
54+
#- uses: julia-actions/julia-buildpkg@latest
3655
- uses: julia-actions/julia-runtest@latest

deps/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ JULIA = julia
2222

2323
CXX_IS_CLANG = $(shell $(CXX) -dM -E - < /dev/null | grep -c __clang__)
2424

25-
VERBOSE = no #use -DVERBOSE to enable verbosity
25+
VERBOSE = no#use -DVERBOSE to enable verbosity
2626
# Verbose output
2727
ifeq ($(VERBOSE), no)
28-
Q =
29-
else
3028
Q = @
29+
else
30+
Q =
3131
endif
3232

3333
ifeq ($(UNAME),Darwin)

0 commit comments

Comments
 (0)