mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-02-21 18:40:00 +00:00
feat(build): Add initial support for GNOME images
This commit is contained in:
parent
25e64543cd
commit
b9362e5b07
20
.github/workflows/build.yml
vendored
20
.github/workflows/build.yml
vendored
@ -36,6 +36,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
image_flavor: [main, nvidia]
|
image_flavor: [main, nvidia]
|
||||||
base_name: [bazzite, bazzite-deck]
|
base_name: [bazzite, bazzite-deck]
|
||||||
|
base_image_name: [kinoite, silverblue]
|
||||||
major_version: [38]
|
major_version: [38]
|
||||||
include:
|
include:
|
||||||
- major_version: 38
|
- major_version: 38
|
||||||
@ -51,10 +52,20 @@ jobs:
|
|||||||
|
|
||||||
- name: Matrix Variables
|
- name: Matrix Variables
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ matrix.image_flavor }}" == "main" ]]; then
|
echo "BASE_IMAGE_NAME=${{ matrix.base_image_name }}" >> $GITHUB_ENV
|
||||||
echo "IMAGE_NAME=${{ matrix.base_name }}" >> $GITHUB_ENV
|
if [[ "${{ matrix.base_image_name }}" == "silverblue" ]]; then
|
||||||
|
DESKTOP="gnome"
|
||||||
|
if [[ "${{ matrix.image_flavor }}" == "main" ]]; then
|
||||||
|
echo "IMAGE_NAME=${{ format('{0}-{1}', matrix.base_name, '${DESKTOP}') }}" >> $GITHUB_ENV
|
||||||
|
else
|
||||||
|
echo "IMAGE_NAME=${{ format('{0}-{1}-{2}', matrix.base_name, '${DESKTOP}', matrix.image_flavor) }}" >> $GITHUB_ENV
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "IMAGE_NAME=${{ format('{0}-{1}', matrix.base_name, matrix.image_flavor) }}" >> $GITHUB_ENV
|
if [[ "${{ matrix.image_flavor }}" == "main" ]]; then
|
||||||
|
echo "IMAGE_NAME=${{ matrix.base_name }}" >> $GITHUB_ENV
|
||||||
|
else
|
||||||
|
echo "IMAGE_NAME=${{ format('{0}-{1}', matrix.base_name, matrix.image_flavor) }}" >> $GITHUB_ENV
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Generate tags
|
- name: Generate tags
|
||||||
@ -101,7 +112,7 @@ jobs:
|
|||||||
- name: Get Current Fedora Version
|
- name: Get Current Fedora Version
|
||||||
id: labels
|
id: labels
|
||||||
run: |
|
run: |
|
||||||
ver=$(skopeo inspect docker://ghcr.io/ublue-os/kinoite-${{ matrix.image_flavor }}:${{ matrix.major_version }} | jq -r '.Labels["org.opencontainers.image.version"]')
|
ver=$(skopeo inspect docker://ghcr.io/ublue-os/${{ matrix.base_image_name }}-${{ matrix.image_flavor }}:${{ matrix.major_version }} | jq -r '.Labels["org.opencontainers.image.version"]')
|
||||||
echo "VERSION=$ver" >> $GITHUB_OUTPUT
|
echo "VERSION=$ver" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# Build metadata
|
# Build metadata
|
||||||
@ -131,6 +142,7 @@ jobs:
|
|||||||
build-args: |
|
build-args: |
|
||||||
IMAGE_NAME=${{ env.IMAGE_NAME }}
|
IMAGE_NAME=${{ env.IMAGE_NAME }}
|
||||||
IMAGE_FLAVOR=${{ matrix.image_flavor }}
|
IMAGE_FLAVOR=${{ matrix.image_flavor }}
|
||||||
|
BASE_IMAGE_NAME=${{ matrix.base_image_name }}
|
||||||
FEDORA_MAJOR_VERSION=${{ matrix.major_version }}
|
FEDORA_MAJOR_VERSION=${{ matrix.major_version }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
oci: false
|
oci: false
|
||||||
|
Loading…
x
Reference in New Issue
Block a user