From a5d9be72cc4c0feac130902fa946aff83c6b64d2 Mon Sep 17 00:00:00 2001 From: saicharankandukuri Date: Sun, 18 May 2025 11:44:55 +0530 Subject: [PATCH 1/3] feat(suites): add ubuntu questing suite --- .github/scripts/build-jammy.sh | 101 ---------------------- .github/workflows/build-udroid.yml | 72 +++++++-------- core/debootstrap-scripts/scripts/questing | 1 + 3 files changed, 37 insertions(+), 137 deletions(-) delete mode 100755 .github/scripts/build-jammy.sh create mode 120000 core/debootstrap-scripts/scripts/questing diff --git a/.github/scripts/build-jammy.sh b/.github/scripts/build-jammy.sh deleted file mode 100755 index 43a78e2..0000000 --- a/.github/scripts/build-jammy.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env bash - -source plugins/envsetup - -export OVERRIDER_COMPRESSION_TYPE -export ENABLE_EXIT -export ENABLE_USER_SETUP - -SUITE="jammy" -frn="out/$SUITE-raw" -OVERRIDER_COMPRESSION_TYPE="gzip" -ENABLE_EXIT=true -ENABLE_USER_SETUP=false -PREFIX="${frn}" - -additional_setup() { - -# GitHub workflow specific -# try to add permissions to $chroot_dir/etc/apt/sources.list -sudo chmod +r+w $chroot_dir/etc/apt/sources.list - -cat <<- EOF > $chroot_dir/etc/apt/sources.list -# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to -# newer versions of the distribution. -deb $MIRROR $SUITE main restricted -# deb-src $MIRROR $SUITE main restricted - -## Major bug fix updates produced after the final release of the -## distribution. -deb $MIRROR $SUITE-updates main restricted -# deb-src $MIRROR $SUITE-updates main restricted - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team. Also, please note that software in universe WILL NOT receive any -## review or updates from the Ubuntu security team. -deb $MIRROR $SUITE universe -# deb-src $MIRROR $SUITE universe -deb $MIRROR $SUITE-updates universe -# deb-src $MIRROR $SUITE-updates universe - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team, and may not be under a free licence. Please satisfy yourself as to -## your rights to use the software. Also, please note that software in -## multiverse WILL NOT receive any review or updates from the Ubuntu -## security team. -deb $MIRROR $SUITE multiverse -# deb-src $MIRROR $SUITE multiverse -deb $MIRROR $SUITE-updates multiverse -# deb-src $MIRROR $SUITE-updates multiverse - -## N.B. software from this repository may not have been tested as -## extensively as that contained in the main release, although it includes -## newer versions of some applications which may provide useful features. -## Also, please note that software in backports WILL NOT receive any review -## or updates from the Ubuntu security team. -deb $MIRROR $SUITE-backports main restricted universe multiverse -# deb-src $MIRROR $SUITE-backports main restricted universe multiverse - -EOF - -# set up pv -lshout "Setting up pv..." -# cp $ROOT_DIR/core/pv/pv-${t_arch}.deb $chroot_dir -# run_cmd "dpkg -i /pv-${t_arch}.deb" -# run_cmd "rm /pv-${t_arch}.deb" -run_cmd "apt update" -run_cmd "apt install pv -y" -run_cmd "apt clean" - -# clean any archive if exits -apt-get clean - -} - -do_build "$PREFIX-arm64" arm64 -do_build "$PREFIX-armhf" armhf -do_build "$PREFIX-amd64" amd64 - -do_compress "$PREFIX-arm64" -do_compress "$PREFIX-armhf" -do_compress "$PREFIX-amd64" - -do_unmount "$PREFIX-arm64" -do_unmount "$PREFIX-armhf" -do_unmount "$PREFIX-amd64" - -shout "setting up artifacts for GitHub" -msg "creating $SUITE-{arm64,amd64,armhf} directories" -mkdir -pv $SUITE-{arm64,amd64,armhf} - -msg "copying tarballs to directories" -cp -rv $frn-arm64*tar* $SUITE-arm64 -cp -rv $frn-armhf*tar* $SUITE-armhf -cp -rv $frn-amd64*tar* $SUITE-amd64 - -msg "calculating sha256sums" -sha256sum $frn-arm64*tar* > $SUITE-arm64/SHA256SUM -sha256sum $frn-armhf*tar* > $SUITE-armhf/SHA256SUM -sha256sum $frn-amd64*tar* > $SUITE-amd64/SHA256SUM - -shout "done" diff --git a/.github/workflows/build-udroid.yml b/.github/workflows/build-udroid.yml index d910d2a..0b581c6 100644 --- a/.github/workflows/build-udroid.yml +++ b/.github/workflows/build-udroid.yml @@ -1,46 +1,46 @@ name: build-udroid on: - push: - paths: - - "**.sh" - - "**.yml" - workflow_dispatch: { } + push: + paths: + - "**.sh" + - "**.yml" + workflow_dispatch: {} jobs: - BuidJammyRaw: - name: build Jammy - runs-on: ubuntu-latest - steps: - - name: checkout repo - uses: actions/checkout@v3 - with: - submodules: recursive + BuidJammyRaw: + name: build Jammy + runs-on: ubuntu-latest + steps: + - name: checkout repo + uses: actions/checkout@v3 + with: + submodules: recursive - - name: Docker Setup QEMU - uses: docker/setup-qemu-action@v2 + - name: Docker Setup QEMU + uses: docker/setup-qemu-action@v2 - - name: Satify Dependencies - run: | - sudo apt-get update - sudo apt-get install git build-essential binfmt-support qemu-user-static debootstrap -y + - name: Satify Dependencies + run: | + sudo apt-get update + sudo apt-get install git build-essential binfmt-support qemu-user-static debootstrap -y - - name: Trigger fs-cook - run: sudo bash .github/scripts/build-jammy.sh + - name: Trigger fs-cook + run: sudo bash .github/scripts/build-latest.sh - - name: save arm64 builds - uses: actions/upload-artifact@v2 - with: - name: jammy-raw-arm64 - path: jammy-arm64 + - name: save arm64 builds + uses: actions/upload-artifact@v2 + with: + name: jammy-raw-arm64 + path: jammy-arm64 - - name: save armhf builds - uses: actions/upload-artifact@v2 - with: - name: jammy-raw-armhf - path: jammy-armhf + - name: save armhf builds + uses: actions/upload-artifact@v2 + with: + name: jammy-raw-armhf + path: jammy-armhf - - name: save amd64 builds - uses: actions/upload-artifact@v2 - with: - name: jammy-raw-amd64 - path: jammy-amd64 + - name: save amd64 builds + uses: actions/upload-artifact@v2 + with: + name: jammy-raw-amd64 + path: jammy-amd64 diff --git a/core/debootstrap-scripts/scripts/questing b/core/debootstrap-scripts/scripts/questing new file mode 120000 index 0000000..3840936 --- /dev/null +++ b/core/debootstrap-scripts/scripts/questing @@ -0,0 +1 @@ +gutsy \ No newline at end of file From 1337d7a2c85b967ec61d9a4b85586ebfa22a3cdd Mon Sep 17 00:00:00 2001 From: saicharankandukuri Date: Sun, 18 May 2025 11:51:24 +0530 Subject: [PATCH 2/3] chore: fixup files names for workflows --- .github/scripts/build-udroid.sh | 101 +++++++++++++++++++++++++++++ .github/workflows/build-udroid.yml | 2 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100755 .github/scripts/build-udroid.sh diff --git a/.github/scripts/build-udroid.sh b/.github/scripts/build-udroid.sh new file mode 100755 index 0000000..6c1dd52 --- /dev/null +++ b/.github/scripts/build-udroid.sh @@ -0,0 +1,101 @@ +#!/usr/bin/env bash + +source plugins/envsetup + +export OVERRIDER_COMPRESSION_TYPE +export ENABLE_EXIT +export ENABLE_USER_SETUP + +SUITE="questing" +frn="out/$SUITE-raw" +OVERRIDER_COMPRESSION_TYPE="gzip" +ENABLE_EXIT=true +ENABLE_USER_SETUP=false +PREFIX="${frn}" + +additional_setup() { + +# GitHub workflow specific +# try to add permissions to $chroot_dir/etc/apt/sources.list +sudo chmod +r+w $chroot_dir/etc/apt/sources.list + +cat <<- EOF > $chroot_dir/etc/apt/sources.list +# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to +# newer versions of the distribution. +deb $MIRROR $SUITE main restricted +# deb-src $MIRROR $SUITE main restricted + +## Major bug fix updates produced after the final release of the +## distribution. +deb $MIRROR $SUITE-updates main restricted +# deb-src $MIRROR $SUITE-updates main restricted + +## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team. Also, please note that software in universe WILL NOT receive any +## review or updates from the Ubuntu security team. +deb $MIRROR $SUITE universe +# deb-src $MIRROR $SUITE universe +deb $MIRROR $SUITE-updates universe +# deb-src $MIRROR $SUITE-updates universe + +## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team, and may not be under a free licence. Please satisfy yourself as to +## your rights to use the software. Also, please note that software in +## multiverse WILL NOT receive any review or updates from the Ubuntu +## security team. +deb $MIRROR $SUITE multiverse +# deb-src $MIRROR $SUITE multiverse +deb $MIRROR $SUITE-updates multiverse +# deb-src $MIRROR $SUITE-updates multiverse + +## N.B. software from this repository may not have been tested as +## extensively as that contained in the main release, although it includes +## newer versions of some applications which may provide useful features. +## Also, please note that software in backports WILL NOT receive any review +## or updates from the Ubuntu security team. +deb $MIRROR $SUITE-backports main restricted universe multiverse +# deb-src $MIRROR $SUITE-backports main restricted universe multiverse + +EOF + +# set up pv +lshout "Setting up pv..." +# cp $ROOT_DIR/core/pv/pv-${t_arch}.deb $chroot_dir +# run_cmd "dpkg -i /pv-${t_arch}.deb" +# run_cmd "rm /pv-${t_arch}.deb" +run_cmd "apt update" +run_cmd "apt install pv -y" +run_cmd "apt clean" + +# clean any archive if exits +apt-get clean + +} + +do_build "$PREFIX-arm64" arm64 +do_build "$PREFIX-armhf" armhf +do_build "$PREFIX-amd64" amd64 + +do_compress "$PREFIX-arm64" +do_compress "$PREFIX-armhf" +do_compress "$PREFIX-amd64" + +do_unmount "$PREFIX-arm64" +do_unmount "$PREFIX-armhf" +do_unmount "$PREFIX-amd64" + +shout "setting up artifacts for GitHub" +msg "creating $SUITE-{arm64,amd64,armhf} directories" +mkdir -pv $SUITE-{arm64,amd64,armhf} + +msg "copying tarballs to directories" +cp -rv $frn-arm64*tar* $SUITE-arm64 +cp -rv $frn-armhf*tar* $SUITE-armhf +cp -rv $frn-amd64*tar* $SUITE-amd64 + +msg "calculating sha256sums" +sha256sum $frn-arm64*tar* > $SUITE-arm64/SHA256SUM +sha256sum $frn-armhf*tar* > $SUITE-armhf/SHA256SUM +sha256sum $frn-amd64*tar* > $SUITE-amd64/SHA256SUM + +shout "done" diff --git a/.github/workflows/build-udroid.yml b/.github/workflows/build-udroid.yml index 0b581c6..6997c0b 100644 --- a/.github/workflows/build-udroid.yml +++ b/.github/workflows/build-udroid.yml @@ -25,7 +25,7 @@ jobs: sudo apt-get install git build-essential binfmt-support qemu-user-static debootstrap -y - name: Trigger fs-cook - run: sudo bash .github/scripts/build-latest.sh + run: sudo bash .github/scripts/build-udroid.sh - name: save arm64 builds uses: actions/upload-artifact@v2 From f0fd42fbec7f58084567ff0c0a597d7f6fe5b8e6 Mon Sep 17 00:00:00 2001 From: saicharankandukuri Date: Sun, 18 May 2025 11:58:58 +0530 Subject: [PATCH 3/3] chore: attempt to change naming convention in workflow To test a new suite everytime everytime: when there is a new suite released i can test it out with github actions if folder name is set to latest instead of suite name --- .github/scripts/build-udroid.sh | 18 +++++++++--------- .github/workflows/build-udroid.yml | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/scripts/build-udroid.sh b/.github/scripts/build-udroid.sh index 6c1dd52..2128dc4 100755 --- a/.github/scripts/build-udroid.sh +++ b/.github/scripts/build-udroid.sh @@ -72,17 +72,17 @@ apt-get clean } -do_build "$PREFIX-arm64" arm64 -do_build "$PREFIX-armhf" armhf -do_build "$PREFIX-amd64" amd64 +do_build "latest-test-arm64" arm64 +do_build "latest-test-armhf" armhf +do_build "latest-test-amd64" amd64 -do_compress "$PREFIX-arm64" -do_compress "$PREFIX-armhf" -do_compress "$PREFIX-amd64" +do_compress "latest-test-arm64" +do_compress "latest-test-armhf" +do_compress "latest-test-amd64" -do_unmount "$PREFIX-arm64" -do_unmount "$PREFIX-armhf" -do_unmount "$PREFIX-amd64" +do_unmount "latest-test-arm64" +do_unmount "latest-test-armhf" +do_unmount "latest-test-amd64" shout "setting up artifacts for GitHub" msg "creating $SUITE-{arm64,amd64,armhf} directories" diff --git a/.github/workflows/build-udroid.yml b/.github/workflows/build-udroid.yml index 6997c0b..e4a8710 100644 --- a/.github/workflows/build-udroid.yml +++ b/.github/workflows/build-udroid.yml @@ -8,7 +8,7 @@ on: jobs: BuidJammyRaw: - name: build Jammy + name: build latest runs-on: ubuntu-latest steps: - name: checkout repo @@ -28,19 +28,19 @@ jobs: run: sudo bash .github/scripts/build-udroid.sh - name: save arm64 builds - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: jammy-raw-arm64 - path: jammy-arm64 + name: latest-test-raw-arm64 + path: latest-test-arm64 - name: save armhf builds - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: jammy-raw-armhf - path: jammy-armhf + name: latest-test-raw-armhf + path: latest-test-armhf - name: save amd64 builds - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: jammy-raw-amd64 - path: jammy-amd64 + name: latest-test-raw-amd64 + path: latest-test-amd64