Merge branch 'master' into xcode-flag-fix

Author: DilumAluthge

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
       - run: exit 0
   test:
     timeout-minutes: 90
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.github-runner }}
     strategy:
       max-parallel: 20 # leave space for other runs in the JuliaLang org, given these tests are long
       fail-fast: false
@@ -49,34 +49,40 @@ jobs:
           - '1.6' # previous LTS
           # - '1.9' # TODO: uncomment this line once we fix the tests on 1.9
           - '1.10' # current LTS
-          # - '1.11' # TODO: uncomment this line once we fix the tests on 1.11
+          - '1.11'
           # - 'nightly' # TODO: decide whether we want to run any CI jobs on nightly.
-        julia-arch:
-          - 'x64' # 32-bit Julia
-          - 'x86' # 64-bit Julia
-        os:
+        julia-wordsize:
+          # The value here only affects the version of Julia binary that we download.
+          # It does not affect the architecture of the GitHub Runner (virtual machine) that
+          # we run on.
+          - '32' # 32-bit Julia. Only available on x86_64. Not available on aarch64.
+          - '64' # 64-bit Julia.
+        github-runner:
           - ubuntu-latest
           - windows-latest
           - macos-13 # macos-13 = Intel.
-          # TODO: uncomment the next line, so that we can start testing on macos-14:
-          # - macos-14 # macos-14 = Apple Silicon.
+          - macos-14 # macos-14 = Apple Silicon.
         coverage:
           - '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 Windows.
           # TODO: remove the following once we fix the tests for 32-bit Julia 1.9 on Windows.
-          - os: windows-latest
-            julia-arch: x86
+          - github-runner: windows-latest
             julia-version: '1.9'
+            julia-wordsize: '32'
           #
-          # We don't have 32-bit builds of Julia for macOS:
-          - os: macos-latest
-            julia-arch: x86
+          # Julia 1.6 did not support Apple Silicon:
+          - github-runner: macos-14 # macos-14 = Apple Silicon.
+            julia-version: '1.6'
           #
-          # We don't have 32-bit builds of Julia for macOS:
-          - os: macos-latest
-            julia-arch: x86
+          # We don't have 32-bit builds of Julia for Intel macOS:
+          - github-runner: macos-13 # macos-13 = Intel.
+            julia-wordsize: '32'
+          #
+          # We don't have 32-bit builds of Julia for Apple Silicon macOS:
+          - github-runner: macos-14 # macos-14 = Apple Silicon.
+            julia-wordsize: '32'
           #
           # We don't need to run the coverage=false job for Julia < 1.9:
           - julia-version: '1.6'
@@ -90,6 +96,13 @@ jobs:
       - 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:
@@ -121,6 +134,7 @@ jobs:
       - uses: julia-actions/setup-julia@9b79636afcfb07ab02c256cede01fe2db6ba808c # v2.6.0
         with:
           version: '1'
+      - uses: julia-actions/cache@824243901fb567ccb490b0d0e2483ccecde46834 # v2.0.5
       - uses: julia-actions/julia-buildpkg@90dd6f23eb49626e4e6612cb9d64d456f86e6a1c # v1.6.0
         with:
           project: 'examples/MyLib'

Project.toml

@@ -1,6 +1,6 @@
 name = "PackageCompiler"
 uuid = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
-version = "2.1.19"
+version = "2.1.20"
 
 [deps]
 Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"

src/embedding_wrapper.c

@@ -105,7 +105,10 @@ int main(int argc, char *argv[]) {
     jl_value_t *firstarg = checked_eval_string("popfirst!(ARGS)");
     JL_GC_PUSH1(&firstarg);
     jl_sym_t *var = jl_symbol("PROGRAM_FILE");
-#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 10
+#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 11
+    jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var, /* alloc */ 1);
+    jl_checked_assignment(bp, jl_base_module, var, firstarg);
+#elif JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 10
     jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var);
     jl_checked_assignment(bp, jl_base_module, var, firstarg);
 #elif JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 9

test/runtests.jl

@@ -16,13 +16,22 @@ Base.init_depot_path()
 const is_ci = tryparse(Bool, get(ENV, "CI", "")) === true
 const is_slow_ci = is_ci && Sys.ARCH == :aarch64
 const is_julia_1_6 = VERSION.major == 1 && VERSION.minor == 6
+const is_julia_1_11 = VERSION.major == 1 && VERSION.minor == 11
+
+if is_ci
+    @show Sys.ARCH
+end
+
+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
 
-if is_ci
-    @show Sys.ARCH
+if is_julia_1_11
+    @warn "This is Julia 1.11. Some tests will be skipped or modified." VERSION
 end
 
 function remove_llvmextras(project_file)
@@ -73,6 +82,13 @@ end
     app_compiled_dir = joinpath(tmp, "MyAppCompiled")
     @testset for incremental in (is_slow_ci ? (false,) : (true, false))
         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
+                continue
+            end
             filter_stdlibs = (is_slow_ci ? (true, ) : (true, false))
         else
             filter_stdlibs = (false,)