Cleanup APT-builds

2022-11-06 22:41:23 +01:00 · 2022-11-06 22:41:23 +01:00 · 06091b0786
parent 49b83abcdf
commit 06091b0786
7 changed files with 49 additions and 36 deletions
--- a/.github/workflows/apt.yml
+++ b/.github/workflows/apt.yml
@ -20,8 +20,9 @@ jobs:
      - name: Set APT matrix
        id: apt-ppa
        run: |
-          APT=$(jq -n '.include |= [inputs[]]' .github/workflows/apt/*.json --compact-output)
-          echo "::set-output name=apt::$APT"
+          APT=$(jq -n '.include |= [ inputs[] | select(.["exclude"] != true)]' .github/workflows/apt/*.json --compact-output)
+          echo "apt=$APT" >> $GITHUB_OUTPUT
+
    outputs:
      apt-matrix: ${{ steps.apt-ppa.outputs.apt }}

--- a/.github/workflows/apt/amd64.json
+++ b/.github/workflows/apt/amd64.json
@ -15,14 +15,6 @@
 		"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
 		"description": "Ubuntu 20.04 (Focal Fossa) (amd64)"
 	},
-	{
-		"distribution": "Impish",
-		"architecture": "amd64",
-		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
-		"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg, libcec6",
-		"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
-		"description": "Ubuntu 21.10 (Impish Indri) (amd64)"
-	},
 	{
 		"distribution": "Jammy",
 		"architecture": "amd64",
@ -38,7 +30,7 @@
 		"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
 		"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
 		"description": "Ubuntu 22.10 (Kinetic Kudu) (amd64)"
-	},	
+	},
 	{
 		"distribution": "Stretch",
 		"architecture": "amd64",
--- a/.github/workflows/apt/arm64.json
+++ b/.github/workflows/apt/arm64.json
@ -16,12 +16,20 @@
 		"description": "Ubuntu 20.04 (Focal Fossa) (arm64)"
 	},
 	{
-		"distribution": "Impish",
+		"distribution": "Jammy",
 		"architecture": "arm64",
 		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
-		"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg, libcec6",
+		"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
 		"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
-		"description": "Ubuntu 21.10 (Impish Indri) (arm64)"
+		"description": "Ubuntu 22.04 (Jammy Jellyfish) (arm64)"
+	},
+	{
+		"distribution": "Kinetic",
+		"architecture": "arm64",
+		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
+		"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
+		"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
+		"description": "Ubuntu 22.10 (Kinetic Kudu) (arm64)"
 	},
 	{
 		"distribution": "Buster",
@ -38,5 +46,14 @@
 		"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg0, libcec6",
 		"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
 		"description": "Debian 11.x (Bullseye) (arm64)"
+	},
+	{
+		"distribution": "Bookworm",
+		"architecture": "arm64",
+		"build-depends": "git, cmake, python3-dev, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, build-essential, libusb-1.0-0-dev, libcec-dev, libssl-dev, libraspberrypi-dev, libturbojpeg0-dev, libjpeg-dev, libmbedtls-dev",
+		"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg0, libcec6",
+		"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
+		"description": "Debian 12.x (Bookworm) (arm64)",
+		"exclude" : true
 	}
 ]
--- a/.github/workflows/apt/armhf.json
+++ b/.github/workflows/apt/armhf.json
@ -16,12 +16,20 @@
 		"description": "Ubuntu 20.04 (Focal Fossa) (armhf)"
 	},
 	{
-		"distribution": "Impish",
+		"distribution": "Jammy",
 		"architecture": "armhf",
 		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
-		"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg, libcec6",
+		"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
 		"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
-		"description": "Ubuntu 21.10 (Impish Indri) (armhf)"
+		"description": "Ubuntu 22.04 (Jammy Jellyfish) (armhf)"
+	},
+	{
+		"distribution": "Kinetic",
+		"architecture": "armhf",
+		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
+		"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
+		"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
+		"description": "Ubuntu 22.10 (Kinetic Kudu) (armhf)"
 	},
 	{
 		"distribution": "Stretch",
@ -53,6 +61,7 @@
 		"build-depends": "git, cmake, python3-dev, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, build-essential, libusb-1.0-0-dev, libcec-dev, libssl-dev, libraspberrypi-dev, libturbojpeg0-dev, libjpeg-dev, libmbedtls-dev",
 		"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg0, libcec6",
 		"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
-		"description": "Debian 12.x (Bookworm) (armhf)"
+		"description": "Debian 12.x (Bookworm) (armhf)",
+		"exclude" : true
 	}
 ]
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@ -5,7 +5,7 @@ on:
 schedule:
   - cron: '0 0 * * *'
 repository_dispatch:
-   types: [hyperion_nightly_push]   
+   types: [hyperion_nightly_push]

 jobs:
  update:
@ -25,7 +25,7 @@ jobs:

      - name: Check git status
        id: status
-        run: echo "::set-output name=status::$(git status -s)"
+        run: echo "status=$(git status -s)" >> $GITHUB_OUTPUT

      - name: Add and commit changes
        if: ${{ steps.status.outputs.status }}
@ -53,9 +53,9 @@ jobs:
        id: build-necessary
        run: |
          if wget --spider "https://nightly.apt.hyperion-project.org/$(git rev-parse --short HEAD)" 2>/dev/null; then
-              echo "::set-output name=commit-has-changed::false"
+              echo "commit-has-changed=false" >> $GITHUB_OUTPUT
          else
-              echo "::set-output name=commit-has-changed::true"
+              echo "commit-has-changed=true" >> $GITHUB_OUTPUT
          fi
    outputs:
      build-nightly: ${{ steps.build-necessary.outputs.commit-has-changed }}
@ -70,8 +70,9 @@ jobs:
      - name: Set nightly matrix
        id: nightly-ppa
        run: |
-          NIGHTLY=$(jq -n '.include |= [inputs[]]' .github/workflows/apt/*.json --compact-output)
-          echo "::set-output name=nightly::$NIGHTLY"
+          NIGHTLY=$(jq -n '.include |= [ inputs[] | select(.["exclude"] != true)]' .github/workflows/apt/*.json --compact-output)
+          echo "nightly=$NIGHTLY" >> $GITHUB_OUTPUT
+
    outputs:
      nightly-matrix: ${{ steps.nightly-ppa.outputs.nightly }}

@ -130,6 +131,7 @@ jobs:
  publish:
    name: Publish nightly packages
    needs: [setup, build]
+    if: github.repository_owner == 'hyperion-project'
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@ -109,7 +109,7 @@ jobs:
          key: ${{ runner.os }}-Qt.${{ env.QT_VERSION }}

      - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
        with:
          version: ${{ env.QT_VERSION }}
          target: 'desktop'
--- a/debian/distributions
+++ b/debian/distributions
@ -16,24 +16,16 @@ SignWith: yes

 Origin: Hyperion-Project
 Label: apt.hyperion-project.org
-Codename: impish
+Codename: jammy
 Architectures: amd64 armhf arm64
 Components: main
 Description: Official APT Repository by Hyperion Project
 SignWith: yes

-Origin: Hyperion-Project
-Label: apt.hyperion-project.org
-Codename: jammy
-Architectures: amd64
-Components: main
-Description: Official APT Repository by Hyperion Project
-SignWith: yes
-
 Origin: Hyperion-Project
 Label: apt.hyperion-project.org
 Codename: kinetic
-Architectures: amd64
+Architectures: amd64 armhf arm64
 Components: main
 Description: Official APT Repository by Hyperion Project
 SignWith: yes
@ -69,7 +61,7 @@ Origin: Hyperion-Project
 Label: apt.hyperion-project.org
 Suite: unstable
 Codename: bookworm
-Architectures: armhf amd64
+Architectures: amd64
 Components: main
 Description: Official APT Repository by Hyperion Project
 SignWith: yes