diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index 61fbee7..a6164ae 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -30,5 +30,8 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./mainv3.sh diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 0d013ba..352cca0 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -30,5 +30,8 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./mainv3.sh diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index 5b36604..763db72 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -30,6 +30,9 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./mainv3.sh diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index 36a34fb..cbd3f5b 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -30,6 +30,9 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./mainv3.sh diff --git a/mainv3.sh b/mainv3.sh index c7da355..b0767b3 100755 --- a/mainv3.sh +++ b/mainv3.sh @@ -1,7 +1,9 @@ #! /bin/bash -VERSION=$(date '+%Y%m%d') -d +set -e + +VERSION="$(date '+%Y%m%d').git" + 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" @@ -18,13 +20,13 @@ cp -rvf ./debian ./linux-firmware/ cp -rvf ./ath12k ./linux-firmware/ cd ./linux-firmware touch debian/changelog -echo -e "linux-firmware ("$VERSION".git-101pika1) canary; urgency=medium\n\n * New Upstream Release\n\n -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200" > debian/changelog +echo -e "linux-firmware ("$VERSION"-101pika1) canary; urgency=medium\n\n * New Upstream Release\n\n -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200" > debian/changelog # Get build deps apt-get build-dep ./ -y # Build package -LOGNAME=root dh_make --createorig -y -l -p linux-firmware_"$VERSION".git || echo "dh-make didn't go clean" +LOGNAME=root dh_make --createorig -y -l -p linux-firmware_"$VERSION" || echo "dh-make: Ignoring Last Error" dpkg-buildpackage --no-sign # Move the debs to output