Use explicit repo for dev release tarball upload

Author: maureeungaro

.github/workflows/dockers_deploy_and_test.yml

@@ -219,6 +219,7 @@ jobs:
       - name: Upload GEMC tarballs to release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
         shell: bash
         run: |
           shopt -s nullglob
@@ -228,9 +229,9 @@ jobs:
             echo "No GEMC tarballs found"
             exit 1
           fi
-          gh release view "${TAG_NAME}" >/dev/null 2>&1 || \
-            gh release create "${TAG_NAME}" --title "Dev Nightly" --prerelease --notes "Dev nightly release."
-          gh release upload "${TAG_NAME}" "${tarballs[@]}" --clobber
+          gh release view "${TAG_NAME}" --repo "$REPO" >/dev/null 2>&1 || \
+            gh release create "${TAG_NAME}" --repo "$REPO" --title "Dev Nightly" --prerelease --notes "Dev nightly release."
+          gh release upload "${TAG_NAME}" --repo "$REPO" "${tarballs[@]}" --clobber
 
 
   # Manifest stitch

.github/workflows/gemc_binary_tarball_test.yml

@@ -1,5 +1,5 @@
 # Test GEMC binary tarballs in minimal OS images.
-name: Test GEMC Binary Tarballs
+name: Test Binary Tarballs
 
 permissions:
   contents: read
@@ -47,8 +47,7 @@ jobs:
           import sys
 
           sys.path.insert(0, "ci")
-          from functions import map_family
-          from packages import packages_install_command
+          from binary_packages import map_family, packages_install_command
 
           image = sys.argv[1]
           tag = sys.argv[2]
@@ -64,8 +63,7 @@ jobs:
               print("RUN pacman -Sy --noconfirm archlinux-keyring")
           elif image == "almalinux":
               print("RUN dnf install -y 'dnf-command(config-manager)' \\")
-              print("    && dnf config-manager --set-enabled crb \\")
-              print("    && dnf install -y almalinux-release-synergy")
+              print("    && dnf config-manager --set-enabled crb")
 
           print(packages_install_command(image, tag))
           PY

ci/binary_packages.py

@@ -0,0 +1,114 @@
+#!/usr/bin/env python3
+import argparse
+
+valid_images = ["fedora", "ubuntu", "archlinux", "almalinux", "debian"]
+
+
+def map_family(image: str) -> str:
+	if image in ("almalinux", "centos"):
+		return "fedora"
+	if image == "ubuntu":
+		return "debian"
+	return image
+
+
+def unique_preserve_order(items):
+	seen = set()
+	out = []
+	for item in items:
+		if item not in seen:
+			seen.add(item)
+			out.append(item)
+	return out
+
+
+pkg_sections = {
+	"download_unpack": {
+		"fedora": ["ca-certificates", "curl", "gzip", "tar"],
+		"debian": ["ca-certificates", "curl", "gzip", "tar"],
+		"archlinux": ["ca-certificates", "curl", "gzip", "tar"],
+	},
+	"core_runtime": {
+		"fedora": ["expat", "sqlite-libs", "zlib"],
+		"debian": ["libexpat1", "libsqlite3-0", "zlib1g"],
+		"archlinux": ["expat", "sqlite", "zlib"],
+	},
+	"x11_gl": {
+		"fedora": ["libX11", "libXext", "libXmu", "libXt", "mesa-libEGL", "mesa-libGL"],
+		"debian": ["libegl1", "libgl1", "libx11-6", "libxext6", "libxmu6", "libxt6"],
+		"archlinux": ["libx11", "libxext", "libxmu", "libxt", "mesa"],
+	},
+	"qt6": {
+		"fedora": ["qt6-qtbase", "qt6-qtsvg"],
+		"debian": ["libqt6core6t64", "libqt6gui6", "libqt6widgets6", "libqt6opengl6", "libqt6openglwidgets6", "libqt6svg6"],
+		"archlinux": ["qt6-base", "qt6-svg"],
+	},
+	"other_linked_runtime": {
+		"fedora": ["tbb"],
+		"debian": ["libtbb12"],
+		"archlinux": ["tbb"],
+	},
+}
+
+
+def packages_to_be_installed(image: str, tag: str = "") -> str:
+	if image not in valid_images:
+		raise SystemExit(f"invalid image '{image}'; valid images: {', '.join(sorted(valid_images))}")
+
+	family = map_family(image)
+	packages = []
+	for section in pkg_sections.values():
+		packages.extend(section.get(family, []))
+
+	return " ".join(unique_preserve_order(packages))
+
+
+def packages_install_command(image: str, tag: str = "") -> str:
+	family = map_family(image)
+	packages = packages_to_be_installed(image, tag)
+	log = "/tmp/gemc-binary-packages-install.log"
+
+	if family == "fedora":
+		return (
+			"RUN /bin/bash -lc 'set -euo pipefail; "
+			f"dnf install -y --allowerasing {packages} >{log} 2>&1 "
+			f"|| {{ rc=$?; cat {log}; exit $rc; }}'"
+		)
+
+	if family == "debian":
+		return (
+			"ENV DEBIAN_FRONTEND=noninteractive\n"
+			"ENV DEBCONF_NONINTERACTIVE_SEEN=true\n"
+			"ENV TZ=UTC\n"
+			"RUN /bin/bash -lc 'set -euo pipefail; "
+			"ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && "
+			"apt-get update && "
+			f"apt-get install -y --no-install-recommends tzdata {packages} >{log} 2>&1 "
+			f"|| {{ rc=$?; cat {log}; exit $rc; }}'"
+		)
+
+	if family == "archlinux":
+		return (
+			"RUN /bin/bash -lc 'set -euo pipefail; "
+			f"pacman -Syu --noconfirm --needed {packages} >{log} 2>&1 "
+			f"|| {{ rc=$?; cat {log}; exit $rc; }}'"
+		)
+
+	return ""
+
+
+def main():
+	parser = argparse.ArgumentParser(description="Return runtime packages for GEMC binary tarball tests")
+	parser.add_argument("-i", "--image", required=True, help="Target base OS")
+	parser.add_argument("-t", "--tag", default="", help="Target base OS tag")
+	parser.add_argument("--command", action="store_true", help="Print a Dockerfile RUN command instead of the package list")
+	args = parser.parse_args()
+
+	if args.command:
+		print(packages_install_command(args.image, args.tag))
+	else:
+		print(packages_to_be_installed(args.image, args.tag))
+
+
+if __name__ == "__main__":
+	main()