Merge pull request #307 from JuliaTime/ed/fix-gmt

Ensure CUSTOM_REGIONS get compiled
JuliaTime · Nov 18, 2020 · e3ab43d · e3ab43d · iamed2 · Nov 18, 2020
2 parents a7f73ff + 06fccaa
commit e3ab43d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "TimeZones"
 uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53"
 authors = ["Curtis Vogt <curtis.vogt@gmail.com>"]
-version = "1.5.0"
+version = "1.5.1"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/tzdata/build.jl b/src/tzdata/build.jl
@@ -53,7 +53,7 @@ function build(
 
         if !isempty(tz_source_dir)
             @info "Installing $version tzdata region data"
-            regions = intersect(regions, readdir(artifact_dir))
+            regions = union!(intersect(regions, readdir(artifact_dir)), CUSTOM_REGIONS)
             for region in setdiff(regions, CUSTOM_REGIONS)
                 cp(joinpath(artifact_dir, region), joinpath(tz_source_dir, region), force=true)
             end
@@ -87,7 +87,7 @@ function build(
 
         if !isempty(tz_source_dir)
             @info "Extracting $version tzdata archive"
-            regions = intersect(regions, readarchive(archive))
+            regions = union!(intersect(regions, readarchive(archive)), CUSTOM_REGIONS)
             extract(archive, tz_source_dir, setdiff(regions, CUSTOM_REGIONS), verbose=verbose)
         end
     end