Make libffi build also key on mpdec

Author: hoodmane

.github/workflows/reusable-emscripten.yml

@@ -41,6 +41,7 @@ jobs:
       with:
         node-version: ${{ steps.emscripten-config.outputs.node-version }}
     - name: "Cache Emscripten SDK"
+      id: emsdk-cache
       uses: actions/cache@v5
       with:
         path: ${{ env.EMSDK_CACHE }}
@@ -59,7 +60,9 @@ jobs:
     - name: "Make build Python"
       run: python3 Platforms/emscripten make-build-python
     - name: "Make dependencies"
-      run: python3 Platforms/emscripten make-dependencies
+      run: >-
+        python3 Platforms/emscripten make-dependencies
+        ${{ steps.emsdk-cache.outputs.cache-hit == 'true' && '--check-up-to-date' || '' }}
     - name: "Configure host Python"
       run: python3 Platforms/emscripten configure-host --host-runner node -- --config-cache
     - name: "Make host Python"

Platforms/emscripten/__main__.py

@@ -351,10 +351,17 @@ def make_emscripten_libffi(context, working_dir):
     validate_emsdk_version(context.emsdk_cache)
     prefix = context.build_paths["prefix_dir"]
     libffi_config = load_config_toml()["dependencies"]["libffi"]
+    with open(EMSCRIPTEN_DIR / "make_libffi.sh", "rb") as f:
+        libffi_config["make_libffi_shasum"] = hashlib.file_digest(f, "sha256").hexdigest()
     if not should_build_library(
         prefix, "libffi", libffi_config, context.quiet
     ):
         return
+
+    if context.check_up_to_date:
+        print("libffi out of date, expected to be up to date", file=sys.stderr)
+        sys.exit(1)
+
     url = libffi_config["url"]
     version = libffi_config["version"]
     shasum = libffi_config["shasum"]
@@ -382,6 +389,10 @@ def make_mpdec(context, working_dir):
     if not should_build_library(prefix, "mpdec", mpdec_config, context.quiet):
         return
 
+    if context.check_up_to_date:
+        print("libmpdec out of date, expected to be up to date", file=sys.stderr)
+        sys.exit(1)
+
     url = mpdec_config["url"]
     version = mpdec_config["version"]
     shasum = mpdec_config["shasum"]
@@ -678,6 +689,14 @@ def main():
         help="Build all static library dependencies",
     )
 
+    for cmd in [make_mpdec_cmd, make_libffi_cmd, make_dependencies_cmd]:
+        cmd.add_argument(
+            "--check-up-to-date",
+            action="store_true",
+            default=False,
+            help=("If passed, will fail if dependency is out of date"),
+        )
+
     make_build = subcommands.add_parser(
         "make-build-python", help="Run `make` for the build Python"
     )