From 69a78648bad278a2f829e35ec3a9c098a1178a8c Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 24 Jul 2024 14:05:08 +0300 Subject: [PATCH] fix main --- .github/ build-canary-v3 | 1 + .github/workflows/build-canaryv3.yml | 9 ++++--- .github/workflows/build-nestv3.yml | 7 ++++-- .github/workflows/release-canaryv3.yml | 7 ++++-- .github/workflows/release-nestv3.yml | 7 ++++-- main.sh | 29 ++++++++++++++++++++++ mainv3.sh | 34 -------------------------- 7 files changed, 51 insertions(+), 43 deletions(-) create mode 100644 .github/ build-canary-v3 create mode 100755 main.sh delete mode 100755 mainv3.sh diff --git a/.github/ build-canary-v3 b/.github/ build-canary-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/ build-canary-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index 6459279..25f3de9 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -17,7 +17,7 @@ jobs: options: --privileged -it steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Install SSH key uses: shimataro/ssh-key-action@v2 @@ -26,9 +26,12 @@ jobs: name: id_rsa known_hosts: ${{ vars.KNOWN_HOSTS }} if_key_exists: replace - + - name: Update APT Cache run: apt-get update -y + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + - name: Build Package - run: ./mainv3.sh + run: ./main.sh diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 3207daf..80a4e86 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -26,9 +26,12 @@ jobs: name: id_rsa known_hosts: ${{ vars.KNOWN_HOSTS }} if_key_exists: replace - + - name: Update APT Cache run: apt-get update -y + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + - name: Build Package - run: ./mainv3.sh + run: ./main.sh diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index 3f84f51..895def8 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -26,12 +26,15 @@ jobs: name: id_rsa known_hosts: ${{ vars.KNOWN_HOSTS }} if_key_exists: replace - + - name: Update APT Cache run: apt-get update -y + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + - name: Build Package - run: ./mainv3.sh + run: ./main.sh - name: Release Package run: ./release.sh diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index 08eb545..a1aa799 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -26,12 +26,15 @@ jobs: name: id_rsa known_hosts: ${{ vars.KNOWN_HOSTS }} if_key_exists: replace - + - name: Update APT Cache run: apt-get update -y + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + - name: Build Package - run: ./mainv3.sh + run: ./main.sh - name: Release Package run: ./release.sh diff --git a/main.sh b/main.sh new file mode 100755 index 0000000..fe39fec --- /dev/null +++ b/main.sh @@ -0,0 +1,29 @@ +#! /bin/bash + +set -e + +VERSION="0.11.4.ferreogit" + +source ./pika-build-config.sh + +echo "$PIKA_BUILD_ARCH" > pika-build-arch + +# Clone Upstream +git clone https://github.com/ferrreo/booster.git +cp -rvf ./debian ./booster/ +cp -vf ./Makefile ./booster/ +cp -vf ./booster.yml ./booster/ +cp -vf ./update-initramfs ./booster/ +cd ./booster + +# Get build deps +apt-get build-dep ./ -y + +# Build package +LOGNAME=root dh_make --createorig -y -l -p booster_"$VERSION" || echo "dh-make: Ignoring Last Error" +dpkg-buildpackage --no-sign + +# Move the debs to output +cd ../ +mkdir -p ./output +mv ./*.deb ./output/ diff --git a/mainv3.sh b/mainv3.sh deleted file mode 100755 index f183fb7..0000000 --- a/mainv3.sh +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/bash - -set -e - -VERSION="0.11.4.ferreogit" - -export DEBIAN_FRONTEND="noninteractive" -export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_BUILD_OPTIONS="nocheck notest terse" -export DPKG_GENSYMBOLS_CHECK_LEVEL=0 - -# Clone Upstream -git clone https://github.com/ferrreo/booster.git -cp -rvf ./debian ./booster/ -cp -vf ./Makefile ./booster/ -cp -vf ./booster.yml ./booster/ -cp -vf ./update-initramfs ./booster/ -cd ./booster - -# Get build deps -apt-get build-dep ./ -y - -# Build package -LOGNAME=root dh_make --createorig -y -l -p booster_"$VERSION" || echo "dh-make: Ignoring Last Error" -dpkg-buildpackage --no-sign - -# Move the debs to output -cd ../ -mkdir -p ./output -mv ./*.deb ./output/