From b70192c95ee1269a37393deab76d1d544c4263ff Mon Sep 17 00:00:00 2001 From: Curtis Vogt Date: Fri, 20 Dec 2024 15:24:33 -0600 Subject: [PATCH] Validate test failure --- .github/workflows/CI.yml | 2 ++ src/TimeZones.jl | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 205df36d..682d314f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -99,6 +99,7 @@ jobs: Pkg.add(PackageSpec(name="TimeZones", rev=ENV["SHA"])) using TimeZones + # TODO: Use shared project environments when the minimum version of Julia is 1.8 (e.g. `@sysimage`) sysimage: name: System Image - Julia ${{ matrix.version }} - ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -130,6 +131,7 @@ jobs: Pkg.add(PackageSpec(name="PackageCompiler", version="2")) using PackageCompiler create_sysimage(; project="sysimage", sysimage_path="sysimage.so") + # create_sysimage(; project=joinpath(first(DEPOT_PATH), "environments", "sysimage"), sysimage_path="sysimage.so") - name: Validate sysimage works shell: julia --color=yes --project=sysimage -Jsysimage.so {0} run: | diff --git a/src/TimeZones.jl b/src/TimeZones.jl index ce7032b8..dbe34cc8 100644 --- a/src/TimeZones.jl +++ b/src/TimeZones.jl @@ -48,8 +48,9 @@ function __init__() # Backwards compatibility for TZJData versions below v1.3.1. The portion of the # code which determines the `pkg_dir` could be replaced by `pkgdir(TZJData)` however # the `pkgdir` function doesn't work well with relocated system images. - pkg = Base.identify_package(TZJData, "TZJData") - pkg_dir = dirname(dirname(Base.locate_package(pkg))) + # pkg = Base.identify_package(TZJData, "TZJData") + # pkg_dir = dirname(dirname(Base.locate_package(pkg))) + pkg_dir = pkgdir(TZJData) artifact_dict = Artifacts.parse_toml(joinpath(pkg_dir, "Artifacts.toml")) hash = Base.SHA1(artifact_dict["tzjdata"]["git-tree-sha1"]) Artifacts.artifact_path(hash)