diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af7758f..9f6bbad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,9 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update apt cache + run: apt-get update + - name: Build Package run: ./main.sh diff --git a/.github/workflows/release_i386.yml b/.github/workflows/release_i386.yml index b4e56cb..1a4a4cf 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:23.04 + 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 -y - name: Import GPG key id: import_gpg @@ -33,6 +30,9 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update apt cache + run: apt-get update + - name: Build Package run: ./main32.sh diff --git a/debian/changelog b/debian/changelog index 1071fba..4c7e7b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -obs-gamecapture-plugin (10:1.3.4.git-99pika1-lunar) lunar; urgency=medium +obs-gamecapture-plugin (10:1.4.3.git-99pika1) pikauwu; urgency=medium * Rebrand to PikaOS diff --git a/debian/control b/debian/control index 819d80e..61ab2f7 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,6 @@ Homepage: https://github.com/nowrep/obs-vkcapture Package: obs-gamecapture-plugin Architecture: linux-any Multi-Arch: same -Depends: ${misc:Depends}, obs-studio [amd64] +Depends: ${shlibs:Depends}, ${misc:Depends}, obs-studio [amd64] Description: OBS Linux Vulkan/OpenGL game capture diff --git a/main32.sh b/main32.sh index 23887ca..de57cd8 100755 --- a/main32.sh +++ b/main32.sh @@ -1,23 +1,16 @@ #! /bin/bash set -e -# 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/nowrep/obs-vkcapture cp -rvf ./debian ./obs-vkcapture/ cd ./obs-vkcapture # Get build deps -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 --no-sign +dpkg-buildpackage --no-sign # Move the debs to output cd ../ diff --git a/release.sh b/release.sh index 5c59923..1575255 100755 --- a/release.sh +++ b/release.sh @@ -2,7 +2,7 @@ rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ # add debs to repo -ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-main /srv/www/incoming/' +ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pikauwu-main /srv/www/incoming/' # publish the repo -ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:' +ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite pikauwu filesystem:pikarepo:' \ No newline at end of file