mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-03-30 07:20:44 +00:00
Merge branch 'f39-stable'
This commit is contained in:
commit
480d79dcf0
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
@ -45,17 +45,11 @@ jobs:
|
||||
image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
|
||||
base_name: [bazzite, bazzite-deck]
|
||||
base_image_name: [kinoite, silverblue]
|
||||
major_version: [38, 39]
|
||||
major_version: [39]
|
||||
include:
|
||||
- major_version: 38
|
||||
is_latest_version: false
|
||||
is_stable_version: true
|
||||
- major_version: 38
|
||||
is_latest_version: true
|
||||
is_stable_version: true
|
||||
- major_version: 39
|
||||
is_latest_version: true
|
||||
is_stable_version: false
|
||||
is_stable_version: true
|
||||
exclude:
|
||||
- base_name: bazzite-deck
|
||||
image_flavor: nvidia
|
||||
|
@ -3,7 +3,7 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
|
||||
ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}"
|
||||
ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}"
|
||||
ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
|
||||
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
|
||||
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
|
||||
|
||||
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite
|
||||
|
||||
|
@ -6,7 +6,7 @@ IMAGE_INFO="/usr/share/ublue-os/image-info.json"
|
||||
IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME"
|
||||
|
||||
case $FEDORA_MAJOR_VERSION in
|
||||
38)
|
||||
38|39)
|
||||
IMAGE_TAG="latest"
|
||||
;;
|
||||
*)
|
||||
|
Loading…
x
Reference in New Issue
Block a user