From 8f96e6646493204a85c949c78b267a95802d9d96 Mon Sep 17 00:00:00 2001
From: Graham Stark <graham.stark@virtual-worlds.biz>
Date: Fri, 8 Nov 2024 15:52:02 +0000
Subject: [PATCH] artifacts for FRS

---
 Artifacts.toml | 12 ++++++------
 src/Utils.jl   |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Artifacts.toml b/Artifacts.toml
index 3262b26e..0912ca41 100644
--- a/Artifacts.toml
+++ b/Artifacts.toml
@@ -14,17 +14,17 @@ lazy = true
     url = "https://virtual-worlds.biz/artifacts//exampledata.tar.gz"
 
 [scottish-frs-data]
-git-tree-sha1 = "bd6ce2f1f27907a93676494361bda1aa7fc2e50e"
+git-tree-sha1 = "9c5c1e8a29e8f82d861100579cee3e3e49cae464"
 lazy = true
 
     [[scottish-frs-data.download]]
-    sha256 = "84bec85c1b034f3997995dcc8aa2b0fd55e890a1cd8b768ca98ca46d84bb85fd"
-    url = "https://virtual-worlds.biz/artifacts//model-data-scotland-2015-2021.tar.gz"
+    sha256 = "5bc1607882203127bd0c13ddeeb22deb0f51156cd65aa9f4c14af3c1df175ef2"
+    url = "https://virtual-worlds.biz/artifacts//model-data-scotland-2015-2021-v2.tar.gz"
 
 [uk-frs-data]
-git-tree-sha1 = "5816f9889082a215017bd36cb09a9dac38145079"
+git-tree-sha1 = "8891ef02ea5dada4ec097ce0a183502cfafb995f"
 lazy = true
 
     [[uk-frs-data.download]]
-    sha256 = "e02d1f704d94611eab385b224546958ee9f37b3d2e484234df18d46f34ce22c2"
-    url = "https://virtual-worlds.biz/artifacts//model-data-2021-2021.tar.gz"
+    sha256 = "8e3efc98a687441085be9ef5e53b663c2bd9abf6e300efa2dd6edb29993d8777"
+    url = "https://virtual-worlds.biz/artifacts//model-data-2021-2021-v2.tar.gz"
diff --git a/src/Utils.jl b/src/Utils.jl
index 5ecb8695..121a7881 100644
--- a/src/Utils.jl
+++ b/src/Utils.jl
@@ -88,6 +88,9 @@ end
 Given a gzipped tar file in `tmp/` with some data, upload this to a server 
 defined in Project.toml and add an entry to `Artifacts.toml`. Artifact
 is set to lazy load. Uses `ArtifactUtils`.
+
+file should contain: `people.tab` `households.tab` `README.md`, all top-level
+
 """
 function make_artifact(;
    artifact_name :: AbstractString,
@@ -96,7 +99,9 @@ function make_artifact(;
    art_server_upload = @load_preference( "artifact_server_upload" )
    art_server_url = @load_preference( "artifact_server_url" )
    dest = "$(art_server_upload)/$(gzip_file_name)"
+   println( "copying |tmp/$gzip_file_name| to |$dest| ")
    upload = `scp tmp/$(gzip_file_name) $(dest)`
+   println( "upload cmd |$upload|")
    url = "$(art_server_url)/$gzip_file_name"
    try
       run( upload )