refactor: accommodate recent pymake changes

* build code.json/md after building executables * includes double precision entries in metadata
MODFLOW-USGS · Feb 18, 2024 · 59bd345 · 59bd345
1 parent 1771ace
commit 59bd345
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -53,7 +53,7 @@ jobs:
           pip install -r requirements.txt
           pip list
 
-      - name: Build executables
+      - name: Build programs
         run: python scripts/build_programs.py
 
       - name: Upload distribution archive

diff --git a/scripts/build_programs.py b/scripts/build_programs.py
@@ -7,7 +7,7 @@
 from modflow_devtools.ostags import get_modflow_ostag
 
 DEFAULT_RETRIES = 3
-DBL_PREC_PROGRAMS = ["mf2005", "mflgr", "mfnwt", "mfusg"]
+DPRECISION_EXES = ["mf2005", "mflgr", "mfnwt", "mfusg"]
 
 
 def get_fc() -> str:
@@ -73,19 +73,11 @@ def run_cmd(args) -> bool:
     path = Path(args.path)
     path.mkdir(parents=True, exist_ok=True)
     zip_path = Path(path).with_suffix(".zip")
-    dp_programs = ",".join(DBL_PREC_PROGRAMS)
+    dp_exes = ",".join(DPRECISION_EXES)
     retries = args.retries
     fc = get_fc()
     cc = get_cc()
 
-    assert run_cmd(
-        [
-            "make-code-json",
-            "-f",
-            str(path / "code.json"),
-            "--verbose",
-        ]
-    ), "could not make code.json"
     assert run_cmd(
         [
             "make-program",
@@ -104,7 +96,7 @@ def run_cmd(args) -> bool:
     assert run_cmd(
         [
             "make-program",
-            dp_programs,
+            dp_exes,
             "--appdir",
             path,
             "--double",
@@ -116,5 +108,15 @@ def run_cmd(args) -> bool:
             "--zip",
             str(zip_path),
         ]
-    ), f"could not build double precision binaries: {dp_programs}"
+    ), f"could not build double precision binaries: {dp_exes}"
+    assert run_cmd(
+        [
+            "make-code-json",
+            "-ad", str(path),
+            "-f",
+            str(path / "code.json"),
+            "--verbose",
+        ]
+    ), "could not make code.json"
     assert zip_path.is_file(), "could not build distribution zipfile"
+    print(f"created distribution zipfile: {zip_path}")