find-container-digest: fix invoking from other repos

If we export-ignore the action, it can't be used from other repos. Continue export-ignoring other children of .github, to keep raw exports (e.g. GitHub source Zips) relatively clean, and then remove the action from postprocess-sdist.py. Fixes: c8c9c06 ("Generate sdist archive with `meson dist`") Signed-off-by: Benjamin Gilbert <[email protected]>
openslide · Dec 7, 2023 · 4b5306c · 4b5306c
1 parent 16ceb66
commit 4b5306c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,9 +2,12 @@
 *.sh		eol=lf
 
 # Don't include Git/GitHub metadata and development tool configs in
-# sdist tarballs
+# sdist tarballs.
+# Don't ignore the find-container-digest composite action; remove it from
+# postprocess-sdist.py.  This is necessary so other repos can use the action.
 .gitattributes			export-ignore
 .gitignore			export-ignore
-/.github			export-ignore
+/.github/ISSUE_TEMPLATE		export-ignore
+/.github/workflows		export-ignore
 /.pre-commit-config.yaml	export-ignore
 /pyproject.toml			export-ignore
diff --git a/artifacts/postprocess-sdist.py b/artifacts/postprocess-sdist.py
@@ -22,6 +22,7 @@
 
 import os
 from pathlib import Path
+import shutil
 import sys
 
 # handle our own PYTHONPATH prepending, since meson can't set environment
@@ -47,6 +48,9 @@ class Args(TypedArgs):
 os.environ['MESONINTROSPECT'] = args.introspect
 dest = Path(os.environ['MESON_DIST_ROOT'])
 
+# remove those parts of .github not ignored from .gitattributes
+shutil.rmtree(dest / '.github')
+
 # pin openslide-bin version suffix
 version: str = meson_introspect('projectinfo')['version']
 try: