From cae741f91e37b275b6eeabfedb1f6686e2a237f6 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 27 Jul 2025 02:03:05 +0000 Subject: [PATCH] Cleanup build scripts to reduce duplication --- appveyor.yml | 6 +++--- build-aarch64-bookworm.sh | 4 ---- build-aarch64-bullseye.sh | 4 ---- build-aarch64-jammy.sh | 4 ---- build-aarch64-noble.sh | 4 ---- build-amd64-buster.sh | 4 ---- build-armhf-bookworm.sh | 4 ---- build-armhf-bullseye.sh | 4 ---- build-armhf-jammy.sh | 4 ---- build-armhf-noble.sh | 4 ---- build-l4t-jammy.sh | 4 ---- build-l4t-noble.sh | 4 ---- build-riscv64-sid.sh | 4 ---- build-rpi-bookworm.sh | 4 ---- build-rpi-buster.sh | 4 ---- build-rpi64-bookworm.sh | 4 ---- build-rpi64-buster.sh | 4 ---- build-common.sh => build-single.sh | 5 ++++- do-release.sh | 30 +++++++++++++++--------------- 19 files changed, 22 insertions(+), 83 deletions(-) delete mode 100755 build-aarch64-bookworm.sh delete mode 100755 build-aarch64-bullseye.sh delete mode 100755 build-aarch64-jammy.sh delete mode 100755 build-aarch64-noble.sh delete mode 100755 build-amd64-buster.sh delete mode 100755 build-armhf-bookworm.sh delete mode 100755 build-armhf-bullseye.sh delete mode 100755 build-armhf-jammy.sh delete mode 100755 build-armhf-noble.sh delete mode 100755 build-l4t-jammy.sh delete mode 100755 build-l4t-noble.sh delete mode 100755 build-riscv64-sid.sh delete mode 100755 build-rpi-bookworm.sh delete mode 100755 build-rpi-buster.sh delete mode 100755 build-rpi64-bookworm.sh delete mode 100755 build-rpi64-buster.sh rename build-common.sh => build-single.sh (87%) diff --git a/appveyor.yml b/appveyor.yml index df83063..b03a625 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,11 +5,11 @@ clone_depth: 1 environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - BUILD_SCRIPT: ./build-amd64-buster.sh + BUILD_SCRIPT: ./build-single.sh amd64 buster - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - BUILD_SCRIPT: ./build-rpi-buster.sh + BUILD_SCRIPT: ./build-single.sh rpi bookworm - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - BUILD_SCRIPT: ./build-rpi64-buster.sh + BUILD_SCRIPT: ./build-single.sh rpi64 bookworm install: - sh: 'sudo apt update || true' diff --git a/build-aarch64-bookworm.sh b/build-aarch64-bookworm.sh deleted file mode 100755 index dd30277..0000000 --- a/build-aarch64-bookworm.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="aarch64-bookworm" -DOCKERFILE="Dockerfile.aarch64.bookworm" - -. ./build-common.sh diff --git a/build-aarch64-bullseye.sh b/build-aarch64-bullseye.sh deleted file mode 100755 index 4f33aa3..0000000 --- a/build-aarch64-bullseye.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="aarch64-bullseye" -DOCKERFILE="Dockerfile.aarch64.bullseye" - -. ./build-common.sh diff --git a/build-aarch64-jammy.sh b/build-aarch64-jammy.sh deleted file mode 100755 index 898ce5f..0000000 --- a/build-aarch64-jammy.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="aarch64-jammy" -DOCKERFILE="Dockerfile.aarch64.jammy" - -. ./build-common.sh diff --git a/build-aarch64-noble.sh b/build-aarch64-noble.sh deleted file mode 100755 index 11495fb..0000000 --- a/build-aarch64-noble.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="aarch64-noble" -DOCKERFILE="Dockerfile.aarch64.noble" - -. ./build-common.sh diff --git a/build-amd64-buster.sh b/build-amd64-buster.sh deleted file mode 100755 index 2d31838..0000000 --- a/build-amd64-buster.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="amd64-buster" -DOCKERFILE="Dockerfile.amd64.buster" - -. ./build-common.sh diff --git a/build-armhf-bookworm.sh b/build-armhf-bookworm.sh deleted file mode 100755 index f48bbbc..0000000 --- a/build-armhf-bookworm.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="armhf-bookworm" -DOCKERFILE="Dockerfile.armhf.bookworm" - -. ./build-common.sh diff --git a/build-armhf-bullseye.sh b/build-armhf-bullseye.sh deleted file mode 100755 index de33447..0000000 --- a/build-armhf-bullseye.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="armhf-bullseye" -DOCKERFILE="Dockerfile.armhf.bullseye" - -. ./build-common.sh diff --git a/build-armhf-jammy.sh b/build-armhf-jammy.sh deleted file mode 100755 index 2913505..0000000 --- a/build-armhf-jammy.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="armhf-jammy" -DOCKERFILE="Dockerfile.armhf.jammy" - -. ./build-common.sh diff --git a/build-armhf-noble.sh b/build-armhf-noble.sh deleted file mode 100755 index 5c7f713..0000000 --- a/build-armhf-noble.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="armhf-noble" -DOCKERFILE="Dockerfile.armhf.noble" - -. ./build-common.sh diff --git a/build-l4t-jammy.sh b/build-l4t-jammy.sh deleted file mode 100755 index 1860854..0000000 --- a/build-l4t-jammy.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="l4t-jammy" -DOCKERFILE="Dockerfile.l4t.jammy" - -. ./build-common.sh diff --git a/build-l4t-noble.sh b/build-l4t-noble.sh deleted file mode 100755 index c3d9735..0000000 --- a/build-l4t-noble.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="l4t-noble" -DOCKERFILE="Dockerfile.l4t.noble" - -. ./build-common.sh diff --git a/build-riscv64-sid.sh b/build-riscv64-sid.sh deleted file mode 100755 index a4d1015..0000000 --- a/build-riscv64-sid.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="riscv64-sid" -DOCKERFILE="Dockerfile.riscv64.sid" - -. ./build-common.sh diff --git a/build-rpi-bookworm.sh b/build-rpi-bookworm.sh deleted file mode 100755 index 5c27106..0000000 --- a/build-rpi-bookworm.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="rpi-bookworm" -DOCKERFILE="Dockerfile.rpi.bookworm" - -. ./build-common.sh diff --git a/build-rpi-buster.sh b/build-rpi-buster.sh deleted file mode 100755 index c088b97..0000000 --- a/build-rpi-buster.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="rpi-buster" -DOCKERFILE="Dockerfile.rpi.buster" - -. ./build-common.sh diff --git a/build-rpi64-bookworm.sh b/build-rpi64-bookworm.sh deleted file mode 100755 index 8f016fd..0000000 --- a/build-rpi64-bookworm.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="rpi64-bookworm" -DOCKERFILE="Dockerfile.rpi64.bookworm" - -. ./build-common.sh diff --git a/build-rpi64-buster.sh b/build-rpi64-buster.sh deleted file mode 100755 index 8563fc9..0000000 --- a/build-rpi64-buster.sh +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_NAME="rpi64-buster" -DOCKERFILE="Dockerfile.rpi64.buster" - -. ./build-common.sh diff --git a/build-common.sh b/build-single.sh similarity index 87% rename from build-common.sh rename to build-single.sh index e2b20f6..df64ccb 100755 --- a/build-common.sh +++ b/build-single.sh @@ -1,3 +1,6 @@ +TARGET_NAME="$1-$2" +DOCKERFILE="Dockerfile.$1.$2" + TAG_UNIQUE_ID=`(git ls-tree HEAD; git diff-index HEAD) | sha256sum | cut -c-16` TAG_NAME="${TARGET_NAME}_${TAG_UNIQUE_ID}" OUT_DIR="out_$TARGET_NAME" @@ -18,4 +21,4 @@ else echo Built Docker image - cgutman/moonlight-packaging:$TAG_NAME fi -docker run --rm --mount type=bind,source="$(pwd)"/$OUT_DIR,target=/out --mount type=bind,source="$(pwd)"/debian,target=/opt/debian -e COMMIT="$1" cgutman/moonlight-packaging:$TAG_NAME +docker run --rm --mount type=bind,source="$(pwd)"/$OUT_DIR,target=/out --mount type=bind,source="$(pwd)"/debian,target=/opt/debian -e COMMIT="$3" cgutman/moonlight-packaging:$TAG_NAME diff --git a/do-release.sh b/do-release.sh index a95dac0..d667bb3 100755 --- a/do-release.sh +++ b/do-release.sh @@ -12,23 +12,23 @@ set -e ./push-images.sh # Build the packages -./build-l4t-noble.sh $1 & -./build-rpi-buster.sh $1 & -./build-rpi64-buster.sh $1 & -./build-aarch64-jammy.sh $1 & +./build-single.sh l4t noble $1 & +./build-single.sh rpi buster $1 & +./build-single.sh rpi64 buster $1 & +./build-single.sh aarch64 jammy $1 & wait -./build-armhf-jammy.sh $1 & -./build-armhf-bullseye.sh $1 & -./build-aarch64-bullseye.sh $1 & -./build-armhf-noble.sh $1 & -./build-aarch64-noble.sh $1 & +./build-single.sh armhf jammy $1 & +./build-single.sh armhf bullseye $1 & +./build-single.sh aarch64 bullseye $1 & +./build-single.sh armhf noble $1 & +./build-single.sh aarch64 noble $1 & wait -./build-rpi-bookworm.sh $1 & -./build-rpi64-bookworm.sh $1 & -./build-armhf-bookworm.sh $1 & -./build-aarch64-bookworm.sh $1 & -./build-riscv64-sid.sh $1 & -./build-l4t-jammy.sh $1 & +./build-single.sh rpi bookworm $1 & +./build-single.sh rpi64 bookworm $1 & +./build-single.sh armhf bookworm $1 & +./build-single.sh aarch64 bookworm $1 & +./build-single.sh riscv64 sid $1 & +./build-single.sh l4t jammy $1 & wait # Push the moonlight-qt packages to Cloudsmith repos