Cleanup build scripts to reduce duplication

2025-07-27 02:03:05 +00:00
parent 84f5b1e0a0
commit cae741f91e
19 changed files with 22 additions and 83 deletions
--- 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'
--- a/build-aarch64-bookworm.sh
+++ b/build-aarch64-bookworm.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="aarch64-bookworm"
-DOCKERFILE="Dockerfile.aarch64.bookworm"
-
-. ./build-common.sh
--- a/build-aarch64-bullseye.sh
+++ b/build-aarch64-bullseye.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="aarch64-bullseye"
-DOCKERFILE="Dockerfile.aarch64.bullseye"
-
-. ./build-common.sh
--- a/build-aarch64-jammy.sh
+++ b/build-aarch64-jammy.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="aarch64-jammy"
-DOCKERFILE="Dockerfile.aarch64.jammy"
-
-. ./build-common.sh
--- a/build-aarch64-noble.sh
+++ b/build-aarch64-noble.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="aarch64-noble"
-DOCKERFILE="Dockerfile.aarch64.noble"
-
-. ./build-common.sh
--- a/build-amd64-buster.sh
+++ b/build-amd64-buster.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="amd64-buster"
-DOCKERFILE="Dockerfile.amd64.buster"
-
-. ./build-common.sh
--- a/build-armhf-bookworm.sh
+++ b/build-armhf-bookworm.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="armhf-bookworm"
-DOCKERFILE="Dockerfile.armhf.bookworm"
-
-. ./build-common.sh
--- a/build-armhf-bullseye.sh
+++ b/build-armhf-bullseye.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="armhf-bullseye"
-DOCKERFILE="Dockerfile.armhf.bullseye"
-
-. ./build-common.sh
--- a/build-armhf-jammy.sh
+++ b/build-armhf-jammy.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="armhf-jammy"
-DOCKERFILE="Dockerfile.armhf.jammy"
-
-. ./build-common.sh
--- a/build-armhf-noble.sh
+++ b/build-armhf-noble.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="armhf-noble"
-DOCKERFILE="Dockerfile.armhf.noble"
-
-. ./build-common.sh
--- a/build-l4t-jammy.sh
+++ b/build-l4t-jammy.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="l4t-jammy"
-DOCKERFILE="Dockerfile.l4t.jammy"
-
-. ./build-common.sh
--- a/build-l4t-noble.sh
+++ b/build-l4t-noble.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="l4t-noble"
-DOCKERFILE="Dockerfile.l4t.noble"
-
-. ./build-common.sh
--- a/build-riscv64-sid.sh
+++ b/build-riscv64-sid.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="riscv64-sid"
-DOCKERFILE="Dockerfile.riscv64.sid"
-
-. ./build-common.sh
--- a/build-rpi-bookworm.sh
+++ b/build-rpi-bookworm.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="rpi-bookworm"
-DOCKERFILE="Dockerfile.rpi.bookworm"
-
-. ./build-common.sh
--- a/build-rpi-buster.sh
+++ b/build-rpi-buster.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="rpi-buster"
-DOCKERFILE="Dockerfile.rpi.buster"
-
-. ./build-common.sh
--- a/build-rpi64-bookworm.sh
+++ b/build-rpi64-bookworm.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="rpi64-bookworm"
-DOCKERFILE="Dockerfile.rpi64.bookworm"
-
-. ./build-common.sh
--- a/build-rpi64-buster.sh
+++ b/build-rpi64-buster.sh
@@ -1,4 +0,0 @@
-TARGET_NAME="rpi64-buster"
-DOCKERFILE="Dockerfile.rpi64.buster"
-
-. ./build-common.sh
--- a/build-single.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
--- 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