diff --git a/.github/workflows/release_i386.yml b/.github/workflows/release_i386.yml index 85e2856..bb5a721 100644 --- a/.github/workflows/release_i386.yml +++ b/.github/workflows/release_i386.yml @@ -7,16 +7,13 @@ jobs: build: runs-on: self-hosted container: - image: ubuntu:22.10 + image: ghcr.io/pikaos-linux/pika-i386-package-container:latest volumes: - /proc:/proc options: --privileged -it steps: - uses: actions/checkout@v3 - - - name: Install needed packages - run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y - name: Import GPG key id: import_gpg @@ -33,11 +30,8 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace - - name: Fix perms - run: chmod +x ./main32.sh - - name: Build Package - run: ./main32.sh + run: chmod +x ./main32.sh && ./main32.sh - name: Release Package run: ./release.sh diff --git a/debian/changelog b/debian/changelog index 1cbd8ac..a6e6c74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nvidia-vaapi-driver (10:0.0.10-99pika1.lunar) lunar; urgency=medium + + * Upgrade to release 0.0.10 + + -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 + nvidia-vaapi-driver (10:0.0.9.git1-99pika1) kinetic; urgency=medium * Upgrade to master branch to fix i386 diff --git a/main.sh b/main.sh index 04b20d4..2ee76d0 100755 --- a/main.sh +++ b/main.sh @@ -1,7 +1,7 @@ DEBIAN_FRONTEND=noninteractive # Clone Upstream -git clone https://github.com/elFarto/nvidia-vaapi-driver -b master +git clone https://github.com/elFarto/nvidia-vaapi-driver -b v0.0.10 cp -rvf ./debian ./nvidia-vaapi-driver/ cd ./nvidia-vaapi-driver @@ -9,7 +9,7 @@ cd ./nvidia-vaapi-driver apt-get build-dep ./ -y # Build package -dpkg-buildpackage +dpkg-buildpackage --no-sign # Move the debs to output cd ../ diff --git a/main32.sh b/main32.sh index 8776cef..262c73c 100644 --- a/main32.sh +++ b/main32.sh @@ -1,28 +1,17 @@ DEBIAN_FRONTEND=noninteractive -# Add dependent repositories -sudo dpkg --add-architecture i386 -wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add - -add-apt-repository https://ppa.pika-os.com -add-apt-repository ppa:pikaos/pika -add-apt-repository ppa:kubuntu-ppa/backports - # Clone Upstream -git clone https://github.com/elFarto/nvidia-vaapi-driver -b master +git clone https://github.com/elFarto/nvidia-vaapi-driver -b v0.0.10 cp -rvf ./debian ./nvidia-vaapi-driver/ cd ./nvidia-vaapi-driver # Get build deps -ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime -DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata -apt-get install build-essential -y -apt-get install crossbuild-essential-i386 lib32gcc-11-dev -y -apt-get build-dep ./ -y -a i386 +apt-get build-dep ./ -y # Build package -dpkg-buildpackage -a i386 +dpkg-buildpackage --no-sign # Move the debs to output cd ../ mkdir -p ./output -mv ./*.deb ./output/ +mv ./*.deb ./output/ \ No newline at end of file diff --git a/release.sh b/release.sh index ce9e316..9d3b911 100755 --- a/release.sh +++ b/release.sh @@ -5,7 +5,7 @@ dpkg-sig --sign builder ./output/*.deb rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo # Add the new package to the repo -reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/*.deb +reprepro -C main -V --basedir ./output/repo/ includedeb lunar ./output/*.deb # Push the updated ppa repo to the server rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/