From ec972992a9fb5be59d0370d5501aa47a4d651560 Mon Sep 17 00:00:00 2001 From: ferrreo Date: Mon, 24 Apr 2023 18:02:11 +0100 Subject: [PATCH] Update to lunar --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- output/repo/.gitkeep | 0 output/repo/conf/distributions | 8 -------- scripts/release.sh | 7 +++---- 5 files changed, 5 insertions(+), 14 deletions(-) create mode 100644 output/repo/.gitkeep delete mode 100644 output/repo/conf/distributions diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 253fcff..1746b8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: self-hosted container: - image: ubuntu:latest + image: ubuntu:23:04 volumes: - /proc:/proc options: --privileged -it diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c497f86..0243f36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ jobs: build: runs-on: self-hosted container: - image: ubuntu:latest + image: ubuntu:23:04 volumes: - /proc:/proc options: --privileged -it diff --git a/output/repo/.gitkeep b/output/repo/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/output/repo/conf/distributions b/output/repo/conf/distributions deleted file mode 100644 index f3a3dd9..0000000 --- a/output/repo/conf/distributions +++ /dev/null @@ -1,8 +0,0 @@ -Origin: ppa.pika-os.com -Label: apt repository -Codename: kinetic -Architectures: source i386 amd64 -Components: main -Description: pika-os kernel repo -SignWith: AB78C60DFB581603 -Pull: kinetic diff --git a/scripts/release.sh b/scripts/release.sh index 19b84d2..3ef50b7 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -14,12 +14,11 @@ rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./outpu cp ./output/key.gpg ./output/repo/key.gpg # Remove our existing package from the repo - only for current version so we can update it -reprepro -V --basedir ./output/repo/ removefilter kinetic 'Package (% linux-6.3.0-*-pikaos*)' +reprepro -V --basedir ./output/repo/ removefilter lunar 'Package (% linux-6.3.0-*-pikaos*)' # Add the new package to the repo -reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/linux-image*.deb -reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/linux-headers*.deb -#reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/linux-tools*.deb +reprepro -V --basedir ./output/repo/ includedeb lunar ./output/linux-image*.deb +reprepro -V --basedir ./output/repo/ includedeb lunar ./output/linux-headers*.deb # Push the updated ppa repo to the server rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/