aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2024-02-11 22:43:38 -0500
committerJoshua M. Boniface <joshua@boniface.me>2024-02-11 22:44:01 -0500
commit32f7a625356f20dc396bd072c47b19a148e20c19 (patch)
tree71518ad6f703142cca8621886a59b00fe3926581
parentTake minutes and seconds off auto-version (diff)
downloadjellyfin-packaging-32f7a625356f20dc396bd072c47b19a148e20c19.tar.gz
jellyfin-packaging-32f7a625356f20dc396bd072c47b19a148e20c19.tar.bz2
jellyfin-packaging-32f7a625356f20dc396bd072c47b19a148e20c19.zip
Switch to using codenames for releases
Will make life easier when dealing with reprepro later.
-rw-r--r--.github/workflows/release-build.yaml8
-rwxr-xr-xbuild.py36
2 files changed, 20 insertions, 24 deletions
diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml
index 2eea8fe..0dc23c8 100644
--- a/.github/workflows/release-build.yaml
+++ b/.github/workflows/release-build.yaml
@@ -16,9 +16,9 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
- version:
- - 11
- - 12
+ release:
+ - bullseye
+ - bookworm
arch:
- amd64
- arm64
@@ -37,4 +37,4 @@ jobs:
- name: "Run builder for Debian ${{ matrix.version }} ${{ matrix.arch }}"
run: |-
- sudo ./build.py ${{ inputs.version }} debian ${{ matrix.arch }} ${{ matrix.version }}
+ sudo ./build.py ${{ inputs.version }} debian ${{ matrix.arch }} ${{ matrix.release }}
diff --git a/build.py b/build.py
index 1fc6f47..ee51441 100755
--- a/build.py
+++ b/build.py
@@ -14,11 +14,6 @@ import sys
from git import Repo
-try:
- target_release = sys.argv[1]
-except IndexError:
- target_release = "master"
-
# Determine top level directory of this repository ("jellyfin-packaging")
revparse = run(["git", "rev-parse", "--show-toplevel"], stdout=PIPE)
repo_root_dir = revparse.stdout.decode().strip()
@@ -32,9 +27,9 @@ def build_package_deb(jvers, btype, barch, bvers):
ostype = btype if btype in configurations.keys() else None
if ostype is None:
raise ValueError(f"{btype} is not a valid OS type in {configurations.keys()}")
- osversion = bvers if bvers in configurations[btype]['releases'] else None
+ osversion = configurations[btype]['releases'][bvers] if bvers in configurations[btype]['releases'].keys() else None
if osversion is None:
- raise ValueError(f"{bvers} is not a valid {btype} version in {configurations[btype]['releases']}")
+ raise ValueError(f"{bvers} is not a valid {btype} version in {configurations[btype]['releases'].keys()}")
PARCH = configurations[btype]['archmaps'][barch]['PARCH'] if barch in configurations[btype]['archmaps'].keys() else None
if PARCH is None:
raise ValueError(f"{barch} is not a valid {btype} {bvers} architecture in {configurations[btype]['archmaps'].keys()}")
@@ -261,13 +256,13 @@ configurations = {
"PARCH": "armhf",
},
},
- "releases": [
- "11",
- "12",
- ],
+ "releases": {
+ "bullseye": "11",
+ "bookworm": "12",
+ },
"cross-gcc": {
- "11": "10",
- "12": "12",
+ "bullseye": "10",
+ "bookworm": "12",
},
},
"ubuntu": {
@@ -285,14 +280,15 @@ configurations = {
"PARCH": "armhf",
},
},
- "releases": [
- "20.04",
- "22.04",
- ],
+ "releases": {
+ "focal": "20.04",
+ "jammy": "22.04",
+ "noble": "24.04",
+ },
"cross-gcc": {
- "20.04": "10",
- "22.04": "12",
- "24.04": "12",
+ "focal": "10",
+ "jammy": "12",
+ "noble": "12",
},
},
"fedora": {
bgstack15