debugging macos CI

Author: grasph

.github/workflows/test-linux.yml

@@ -7,7 +7,7 @@ on:
 
 defaults:
   run:
-    shell: bash
+    shell: bash -l {0}
 
 jobs:
   test:
@@ -18,6 +18,7 @@ jobs:
       matrix:
         version:
           - '1.10'
+          - '1'
         os:
           - ubuntu-latest
 #          - macOS-latest
@@ -31,5 +32,8 @@ jobs:
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: julia-actions/julia-buildpkg@latest
-      - uses: julia-actions/julia-runtest@latest
+      #- uses: julia-actions/julia-buildpkg@latest
+      - name: Run package tests
+        uses: julia-actions/julia-runtest@latest
+        with:
+          annotate: true 

.github/workflows/test-macos.yml

@@ -17,7 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.10'
+#          - '1.10'
+          - '1'
         os:
 #          - ubuntu-latest
           - macOS-latest
@@ -36,23 +37,17 @@ jobs:
              CONDA_BINDIR="`sh .github/workflows/install_root_with_conda.sh | tail -n 1`"
              source "$CONDA_BINDIR/activate"
              cat >> "$GITHUB_ENV" <<EOF
-             #LDFLAGS="$LDFLAGS"
-             #CPPFLAGS="$CPPFLAGS"
-             #LIBTOOL="$LIBTOOL"
-             #CXXFLAGS="$CXXFLAGS"
-             #CPP="$CPP"
              PATH="$PATH"
-             #LD="$LD"
              CXX="$CXX"
-             #CFLAGS="$CFLAGS"
-             #CC="$CC"
              EOF
              echo -n "ROOT binary: " 1>&2
              which root 1>&2
       - name: Build the Julia wrapper library
         run: |
              cd ..
-             julia --project=@. -e 'import Pkg; Pkg.add("ROOTprefs"); using ROOTprefs; ROOTprefs._set_preference("no_auto_compile", true); Pkg.add(path="./ROOT.jl"); import ROOT; ROOT.cxxcompile();' 1>&2
+             #for some reason in auto-compile mode, the compilation logs are not displayed when run in the CI. Use explicit compile call.
+             julia --project=@. -e 'import Pkg; Pkg.add("ROOTprefs"); using ROOTprefs; ROOTprefs._set_preference("no_auto_compile", true); import ROOT; ROOT.cxxcompile();' 1>&2
+             #trigger package precompilation
              julia --project=@. -e 'import ROOT' 1>&2
       #- uses: julia-actions/julia-buildpkg@latest
       - name: Setup upterm session
@@ -64,5 +59,7 @@ jobs:
           limit-access-to-users: grasph
           # If no one connects after 2 minutes, shut down server.
           wait-timeout-minutes: 2
-      - uses: julia-actions/julia-runtest@latest
-
+      - name: Run package tests
+        uses: julia-actions/julia-runtest@latest
+        with:
+          annotate: true 

src/CxxBuild.jl

@@ -35,7 +35,7 @@ end
 # Build the libroot_julia library for the ROOT libraries installed under rootsys directory.
 # Return the full path to libroot_julia or an empty string in case of failure.
 #
-function build_root_wrapper(rootsys = ROOTprefs.get_ROOTSYS())
+function build_root_wrapper(rootsys=ROOTprefs.get_ROOTSYS(); nobuild=false)
 
     rootconfig = joinpath(rootsys, "bin", "root-config")
     used_root_version = readchomp(`$rootconfig --version`)
@@ -81,7 +81,7 @@ function build_root_wrapper(rootsys = ROOTprefs.get_ROOTSYS())
         end
     end
 
-    build = true
+    libready = false
 
     #Check if library is already built and up-to-date. Returns if it's the case.
     sigfile = joinpath(scratch, "sig")
@@ -91,12 +91,22 @@ function build_root_wrapper(rootsys = ROOTprefs.get_ROOTSYS())
         oldsig = readline(sigfile)
         if newsig == oldsig
             @info "Library $libpath is already up-to-date."
-            build = false
+            libready = true
         end
         t1 = time()
         @info "Time spent to check for modifications in the ROOT-julia library source code that would require a compilation: $(round(t1-t0, digits=2)) s"
     end
 
+    build = if libready
+        false
+    elseif nobuild
+        libpath = ""
+        @info "Build skipped as required by the no_auto_compile preference setting."
+        false
+    else
+        true
+    end
+
     if build
         @info "Build command: " * string(cmd)[2:end-1] * " executed in " * pwd() * " directory."
 
@@ -249,7 +259,7 @@ function check_rootsys()
 end
 
 
-function get_or_build_libroot_julia()
+function get_or_build_libroot_julia(;nobuild=false)
 
     if get_use_root_jll() && is_jll_supported()
         #prebuilt wrapper used, no build to perform
@@ -286,7 +296,7 @@ function get_or_build_libroot_julia()
         end
     end
 
-    libpath =  build_root_wrapper(rootsys)
+    libpath =  build_root_wrapper(rootsys, nobuild=nobuild)
 
     if !isempty(libpath) && rootsys != pref_rootsys
       #If build succeeded and ROOTSYS was modified, update LocalPreference.toml

src/ROOT.jl

@@ -46,8 +46,7 @@ const libroot_julia_from_jll = root_jll_preferred && Internals.CxxBuild.is_jll_s
 
 Path of the shared library containing the C++ code interfacing the Julia ROOT package with the C++ ROOT libraries. This library is provided by the package ROOT_julia_jll included in the dependency, when the C++ ROOT libraries are installed by the Julia package manager from the ROOT_jll package, or built on the fly (at first ROOT module import), if they are installed by another mean. 
 """
-const libroot_julia_path =  ((!libroot_julia_from_jll && Preferences.load_preference("ROOT", "no_auto_compile", false)) ?
-    "" : Internals.CxxBuild.get_or_build_libroot_julia())
+const libroot_julia_path =  Internals.CxxBuild.get_or_build_libroot_julia(nobuild=Preferences.load_preference("ROOT", "no_auto_compile", false))
 
 const _libroot_compilation_failed = if isempty(libroot_julia_path) #precompilation failed
    # trick to invalidate the precompilation cache
@@ -105,7 +104,7 @@ end
 function __init__()
     if !ok()
         ROOTprefs._set_preference("internal_compilation_failed", nothing)
-        @warn "The imported ROOT module is empty because the backend library is not compiled. User ROOT.cxxcompile() to compile it. After compilation  restart of Julia is required after the compilation."
+        @warn "The imported ROOT module is empty because its c++ part is not compiled. Use ROOT.cxxcompile() to compile it. After compilation, restart of Julia is required after the compilation."
     else
         libroot_julia_from_jll && Internals.loadlibdeps()
         @initcxx