Merge branch 'master' into dpa/jayscook/xcode-flag-fix

DilumAluthge · web-flow · commit b2d31c9bb3bc · 2024-10-21T03:25:53.000-04:00
diff --git a/.github/workflows/ci.nightly.yml b/.github/workflows/ci.nightly.yml
@@ -0,0 +1,62 @@
+name: Nightly CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - 'master'
+      - 'release-*'
+    tags: '*'
+  merge_group: # GitHub Merge Queue
+
+concurrency:
+  # Skip intermediate builds: all builds except for builds on the `master` branch
+  # Cancel intermediate builds: only pull request builds
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.run_number }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
+jobs:
+  test-nightly:
+    timeout-minutes: 90
+    runs-on: ${{ matrix.github-runner }}
+    strategy:
+      max-parallel: 5 # leave space for other runs in the JuliaLang org, given these tests are long
+      fail-fast: false
+      matrix:
+        include:
+          # 1. We intentionally put nightly CI into a separate YAML
+          #    file (`ci.nightly.yml` versus the main `ci.yml` file).
+          #    This allows us to enable and disable the nightly CI
+          #    workflow from the GitHub web UI, without having any
+          #    impact on the main CI.
+          # 2. We intentionally only run one CI job on Julia nightly,
+          #    in order to conserve CI resources.
+          # 3. This CI only runs on Julia nightly. It doesn't run on
+          #    Julia pre-releases. For CI on Julia pre-releases, see
+          #    the main CI workflow file.
+          - julia-version: 'nightly'
+            julia-wordsize: '64'
+            github-runner: ubuntu-latest
+            coverage: false
+    steps:
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: julia-actions/setup-julia@9b79636afcfb07ab02c256cede01fe2db6ba808c # v2.6.0
+        with:
+          version: ${{ matrix.julia-version }}
+          # If `julia-wordsize` is 32, then we set `arch` to `x86`, because we know that
+          # 32-bit builds of Julia are only available for x86.
+          #
+          # If `julia-wordsize` is 64, then we set `arch` to `${{ runner.arch }}`, which
+          # GitHub will automatically expand to the correct value (`x86_64` or `aarch64`)
+          # based on the architecture of the underlying GitHub Runner (virtual machine).
+          arch: ${{ github.ref == '32' && 'x86' || runner.arch }}
+      - uses: julia-actions/cache@824243901fb567ccb490b0d0e2483ccecde46834 # v2.0.5
+      - uses: julia-actions/julia-runtest@d0c4f093badade621cd041bba567d1e832480ac2 # v1.10.0
+        with:
+          coverage: ${{ matrix.coverage }}
+      - uses: julia-actions/julia-processcoverage@03114f09f119417c3242a9fb6e0b722676aedf38 # v1.2.2
+      - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
+        with:
+          file: lcov.info
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
       matrix:
         julia-version:
           - '1.6' # previous LTS
-          # - '1.9' # TODO: uncomment this line once we fix the tests on 1.9
+          - '1.9'
           - '1.10' # current LTS
           - '1.11'
           # - 'nightly' # TODO: decide whether we want to run any CI jobs on nightly.
@@ -66,6 +66,10 @@ jobs:
           - 'true'
           - 'false' # needed for Julia 1.9+ to test from a session using pkgimages
         exclude:
+          # For now, we'll disable testing 32-bit Julia 1.9 on all operating systems.
+          # TODO: remove the following once we fix the tests for 32-bit Julia 1.9 .
+          - julia-version: '1.9'
+            julia-wordsize: '32'
           # For now, we'll disable testing 32-bit Julia 1.9 on Windows.
           # TODO: remove the following once we fix the tests for 32-bit Julia 1.9 on Windows.
           - github-runner: windows-latest
diff --git a/examples/MyApp/src/MyApp.jl b/examples/MyApp/src/MyApp.jl
@@ -5,7 +5,11 @@ using HelloWorldC_jll
 using Artifacts
 using Distributed
 using Random
-if VERSION >= v"1.7.0"
+
+# We seem to get problems with LLVMExtra_jll on Julia 1.6 and 1.9
+# Issue for 1.6: https://github.com/JuliaLang/PackageCompiler.jl/issues/706
+# There's no GitHub Issue for 1.9
+@static if (VERSION.major, VERSION.minor) ∉ ((1, 6), (1, 9),)
     using LLVMExtra_jll
 end
 
@@ -85,7 +89,7 @@ function real_main()
     @eval @everywhere using Example
     @everywhere println(Example.domath(3))
 
-    if VERSION >= v"1.7.0"
+    @static if (VERSION.major, VERSION.minor) ∉ ((1, 6), (1, 9),)
         if isfile(LLVMExtra_jll.libLLVMExtra_path)
             println("LLVMExtra path: ok!")
         else
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -14,9 +14,20 @@ ENV["JULIA_DEPOT_PATH"] = new_depot
 Base.init_depot_path()
 
 const is_ci = tryparse(Bool, get(ENV, "CI", "")) === true
-const is_slow_ci = is_ci && Sys.ARCH == :aarch64
+const is_apple_silicon_macos = Sys.ARCH == :aarch64 && Sys.isapple()
+
+# In order to be "slow CI", we must meet all of the following:
+# 1. We are running on CI.
+# 2. We are running on aarch64 (arm64).
+# 3. We are NOT running on Apple Silicon macOS.
+#    (Because for GitHub Actions, the GitHub-hosted Apple Silicon
+#    macOS runners seem to be quite fast.)
+const is_slow_ci = is_ci && Sys.ARCH == :aarch64 && !is_apple_silicon_macos
+
 const is_julia_1_6 = VERSION.major == 1 && VERSION.minor == 6
+const is_julia_1_9 = VERSION.major == 1 && VERSION.minor == 9
 const is_julia_1_11 = VERSION.major == 1 && VERSION.minor == 11
+const is_julia_1_12 = VERSION.major == 1 && VERSION.minor == 12
 
 if is_ci
     @show Sys.ARCH
@@ -26,12 +37,15 @@ if is_slow_ci
     @warn "This is \"slow CI\" (`is_ci && Sys.ARCH == :aarch64`). Some tests will be skipped or modified." Sys.ARCH
 end
 
-if is_julia_1_6
-    @warn "This is Julia 1.6. Some tests will be skipped or modified." VERSION
-end
+const some_tests_skipped = [
+    is_julia_1_6,
+    is_julia_1_9,
+    is_julia_1_11,
+    is_julia_1_12,
+]
 
-if is_julia_1_11
-    @warn "This is Julia 1.11. Some tests will be skipped or modified." VERSION
+if any(some_tests_skipped)
+    @warn "This is Julia $(VERSION.major).$(VERSION.minor). Some tests will be skipped or modified." VERSION
 end
 
 function remove_llvmextras(project_file)
@@ -80,25 +94,37 @@ end
     # Test creating an app
     app_source_dir = joinpath(@__DIR__, "..", "examples/MyApp/")
     app_compiled_dir = joinpath(tmp, "MyAppCompiled")
-    @testset for incremental in (is_slow_ci ? (false,) : (true, false))
+    if is_slow_ci
+        incrementals_list = (true, false)
+    else
+        incrementals_list = (true, false)
+    end
+    @testset for incremental in incrementals_list
         if incremental == false
-            if is_julia_1_11
-                # On Julia 1.11, `incremental=false` is currently broken: https://github.com/JuliaLang/PackageCompiler.jl/issues/976
-                # So, for now, we skip the `incremental=false` tests on Julia 1.11
-                @warn "This is Julia 1.11; skipping incremental=false test due to known bug: https://github.com/JuliaLang/PackageCompiler.jl/issues/976"
-                @test_broken false
+            if is_julia_1_11 || is_julia_1_12
+                # On Julia 1.11 and 1.12, `incremental=false` is currently broken.
+                # 1.11: https://github.com/JuliaLang/PackageCompiler.jl/issues/976
+                # 1.12: No GitHub issue yet.
+                # So, for now, we skip the `incremental=false` tests on Julia 1.11 and 1.12
+                @warn "This is Julia $(VERSION.major).$(VERSION.minor); skipping incremental=false test due to known bug: #976 (for 1.11), issue TODO (for 1.12)"
+                @test_skip false
                 continue
             end
-            filter_stdlibs = (is_slow_ci ? (true, ) : (true, false))
+            if is_slow_ci
+                filter_stdlibs = (true,)
+            else
+                filter_stdlibs = (true, false)
+            end
         else
             filter_stdlibs = (false,)
         end
         @testset for filter in filter_stdlibs
             @info "starting: create_app testset" incremental filter
             tmp_app_source_dir = joinpath(tmp, "MyApp")
             cp(app_source_dir, tmp_app_source_dir)
-            if is_julia_1_6
-                # Issue #706 "Cannot locate artifact 'LLVMExtra'" on 1.6 so remove
+            if is_julia_1_6 || is_julia_1_9
+                # Julia 1.6: Issue #706 "Cannot locate artifact 'LLVMExtra'" on 1.6 so remove.
+                # Julia 1.9: There's no GitHub Issue, but it seems we hit a similar problem.
                 remove_llvmextras(joinpath(tmp_app_source_dir, "Project.toml"))
             end
             try
@@ -154,7 +180,11 @@ end
             @test occursin("From worker 4:\t8", app_output)
             @test occursin("From worker 5:\t8", app_output)
 
-            if VERSION >= v"1.7-"
+            if is_julia_1_6 || is_julia_1_9
+                # Julia 1.6: Issue #706 "Cannot locate artifact 'LLVMExtra'" on 1.6 so remove.
+                # Julia 1.9: There's no GitHub Issue, but it seems we hit a similar problem.
+                @test_skip false
+            else
                 @test occursin("LLVMExtra path: ok!", app_output)
             end
             @test occursin("micromamba_jll path: ok!", app_output)
@@ -184,30 +214,52 @@ end
     end # testset
 
     if !is_slow_ci
-        # Test library creation
-        lib_source_dir = joinpath(@__DIR__, "..", "examples/MyLib")
-        lib_target_dir = joinpath(tmp, "MyLibCompiled")
-
-        incremental = false
-        filter = true
-        lib_name = "inc"
-
-        tmp_lib_src_dir = joinpath(tmp, "MyLib")
-        cp(lib_source_dir, tmp_lib_src_dir)
-        create_library(tmp_lib_src_dir, lib_target_dir; incremental=incremental, force=true, filter_stdlibs=filter,
-                    precompile_execution_file=joinpath(lib_source_dir, "build", "generate_precompile.jl"),
-                    precompile_statements_file=joinpath(lib_source_dir, "build", "additional_precompile.jl"),
-                    lib_name=lib_name, version=v"1.0.0")
-        rm(tmp_lib_src_dir; recursive=true)
+        if is_julia_1_12
+            # On Julia 1.12, `incremental=false` is currently broken when doing `create_library()`.
+            # 1.12: No GitHub issue yet.
+            # So, for now, we skip the `incremental=false` tests on Julia 1.12 when doing `create_library()`.
+            @warn "This is Julia $(VERSION.major).$(VERSION.minor); skipping incremental=false test when doing `create_library()` due to known bug: issue TODO (for 1.12)"
+            @test_skip false
+        else
+            # Test library creation
+            lib_source_dir = joinpath(@__DIR__, "..", "examples/MyLib")
+            lib_target_dir = joinpath(tmp, "MyLibCompiled")
+
+            # This is why we have to skip this test on 1.12:
+            incremental = false
+            
+            filter = true
+            lib_name = "inc"
+
+            tmp_lib_src_dir = joinpath(tmp, "MyLib")
+            cp(lib_source_dir, tmp_lib_src_dir)
+            create_library(tmp_lib_src_dir, lib_target_dir; incremental=incremental, force=true, filter_stdlibs=filter,
+                        precompile_execution_file=joinpath(lib_source_dir, "build", "generate_precompile.jl"),
+                        precompile_statements_file=joinpath(lib_source_dir, "build", "additional_precompile.jl"),
+                        lib_name=lib_name, version=v"1.0.0")
+            rm(tmp_lib_src_dir; recursive=true)
+        end
     end
 
     # Test creating an empty sysimage
     if !is_slow_ci
-        tmp = mktempdir()
-        sysimage_path = joinpath(tmp, "empty." * Libdl.dlext)
-        foreach(x -> touch(joinpath(tmp, x)), ["Project.toml", "Manifest.toml"])
-        create_sysimage(String[]; sysimage_path=sysimage_path, incremental=false, filter_stdlibs=true, project=tmp)
-        hello = read(`$(Base.julia_cmd()) -J $(sysimage_path) -e 'print("hello, world")'`, String)
-        @test hello == "hello, world"
+        if is_julia_1_12
+            # On Julia 1.12, `incremental=false` is currently broken when doing `create_library()`.
+            # 1.12: No GitHub issue yet.
+            # So, for now, we skip the `incremental=false` tests on Julia 1.12 when doing `create_library()`.
+            @warn "This is Julia $(VERSION.major).$(VERSION.minor); skipping incremental=false test when doing `create_library()` due to known bug: issue TODO (for 1.12)"
+            @test_skip false
+        else
+            tmp = mktempdir()
+            sysimage_path = joinpath(tmp, "empty." * Libdl.dlext)
+            foreach(x -> touch(joinpath(tmp, x)), ["Project.toml", "Manifest.toml"])
+
+            # This is why we need to skip this test on 1.12:
+            incremental=false
+            
+            create_sysimage(String[]; sysimage_path=sysimage_path, incremental=incremental, filter_stdlibs=true, project=tmp)
+            hello = read(`$(Base.julia_cmd()) -J $(sysimage_path) -e 'print("hello, world")'`, String)
+            @test hello == "hello, world"
+        end
     end
 end
