Skip to content

Commit b10374b

Browse files
Lord-GreyLord-Grey
committed
Cleanup APT-builds
1 parent 49b83ab commit b10374b

File tree

6 files changed

+46
-25
lines changed

6 files changed

+46
-25
lines changed

‎.github/workflows/apt.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ jobs:
2020
- name: Set APT matrix
2121
id: apt-ppa
2222
run: |
23-
APT=$(jq -n '.include |= [inputs[]]' .github/workflows/apt/*.json --compact-output)
24-
echo "::set-output name=apt::$APT"
23+
APT=$(jq -n '.include |= [ inputs[] | select(.["exclude"] != true)]' .github/workflows/apt/*.json --compact-output)
24+
echo "apt=$APT" >> $GITHUB_OUTPUT
25+
2526
outputs:
2627
apt-matrix: ${{ steps.apt-ppa.outputs.apt }}
2728

‎.github/workflows/apt/amd64.json‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
1616
"description": "Ubuntu 20.04 (Focal Fossa) (amd64)"
1717
},
18-
{
19-
"distribution": "Impish",
20-
"architecture": "amd64",
21-
"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",
22-
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg, libcec6",
23-
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
24-
"description": "Ubuntu 21.10 (Impish Indri) (amd64)"
25-
},
2618
{
2719
"distribution": "Jammy",
2820
"architecture": "amd64",
@@ -38,7 +30,7 @@
3830
"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
3931
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
4032
"description": "Ubuntu 22.10 (Kinetic Kudu) (amd64)"
41-
},
33+
},
4234
{
4335
"distribution": "Stretch",
4436
"architecture": "amd64",

‎.github/workflows/apt/arm64.json‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,20 @@
1616
"description": "Ubuntu 20.04 (Focal Fossa) (arm64)"
1717
},
1818
{
19-
"distribution": "Impish",
19+
"distribution": "Jammy",
2020
"architecture": "arm64",
2121
"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",
22-
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg, libcec6",
22+
"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
2323
"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
24-
"description": "Ubuntu 21.10 (Impish Indri) (arm64)"
24+
"description": "Ubuntu 22.04 (Jammy Jellyfish) (arm64)"
25+
},
26+
{
27+
"distribution": "Kinetic",
28+
"architecture": "arm64",
29+
"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",
30+
"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
31+
"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
32+
"description": "Ubuntu 22.10 (Kinetic Kudu) (arm64)"
2533
},
2634
{
2735
"distribution": "Buster",
@@ -38,5 +46,14 @@
3846
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg0, libcec6",
3947
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
4048
"description": "Debian 11.x (Bullseye) (arm64)"
49+
},
50+
{
51+
"distribution": "Bookworm",
52+
"architecture": "arm64",
53+
"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",
54+
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg0, libcec6",
55+
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
56+
"description": "Debian 12.x (Bookworm) (arm64)",
57+
"exclude" : true
4158
}
4259
]

‎.github/workflows/apt/armhf.json‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,20 @@
1616
"description": "Ubuntu 20.04 (Focal Fossa) (armhf)"
1717
},
1818
{
19-
"distribution": "Impish",
19+
"distribution": "Jammy",
2020
"architecture": "armhf",
2121
"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",
22-
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg, libcec6",
22+
"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
2323
"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
24-
"description": "Ubuntu 21.10 (Impish Indri) (armhf)"
24+
"description": "Ubuntu 22.04 (Jammy Jellyfish) (armhf)"
25+
},
26+
{
27+
"distribution": "Kinetic",
28+
"architecture": "armhf",
29+
"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",
30+
"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
31+
"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
32+
"description": "Ubuntu 22.10 (Kinetic Kudu) (armhf)"
2533
},
2634
{
2735
"distribution": "Stretch",
@@ -53,6 +61,7 @@
5361
"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",
5462
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg0, libcec6",
5563
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
56-
"description": "Debian 12.x (Bookworm) (armhf)"
64+
"description": "Debian 12.x (Bookworm) (armhf)",
65+
"exclude" : true
5766
}
5867
]

‎.github/workflows/nightly.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
schedule:
66
- cron: '0 0 * * *'
77
repository_dispatch:
8-
types: [hyperion_nightly_push]
8+
types: [hyperion_nightly_push]
99

1010
jobs:
1111
update:
@@ -25,7 +25,7 @@ jobs:
2525

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

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

@@ -130,6 +131,7 @@ jobs:
130131
publish:
131132
name: Publish nightly packages
132133
needs: [setup, build]
134+
if: github.repository_owner == 'hyperion-project'
133135
runs-on: ubuntu-latest
134136
steps:
135137
- name: Checkout

‎.github/workflows/push-master.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
key: ${{ runner.os }}-Qt.${{ env.QT_VERSION }}
110110

111111
- name: Install Qt
112-
uses: jurplel/install-qt-action@v2
112+
uses: jurplel/install-qt-action@v3
113113
with:
114114
version: ${{ env.QT_VERSION }}
115115
target: 'desktop'

0 commit comments

Comments
 (0)