summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build.yml26
-rw-r--r--Containerfile6
-rw-r--r--Justfile4
-rw-r--r--image-template.env2
4 files changed, 23 insertions, 15 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02a6055..7a73347 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,6 +5,7 @@ on:
branches:
- main
- testing
+ - testing-candidate
#schedule:
# - cron: '05 10 * * *' # 10:05am UTC everyday
workflow_dispatch:
@@ -23,7 +24,7 @@ env:
IMAGE_LOGO_URL: ${{ vars.IMAGE_LOGO_URL || 'https://avatars.githubusercontent.com/u/120078124?s=200&v=4' }}
DEFAULT_TAG: ${{ vars.DEFAULT_TAG || 'stable' }}
BIB_IMAGE: ${{ vars.BIB_IMAGE || 'quay.io/centos-bootc/bootc-image-builder:latest' }}
- BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:stable' }}
+ BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3' }}
FLATPAK_REMOTE_URL: ${{ vars.FLATPAK_REMOTE_URL }}
HOMEBREW_BOTTLE_DOMAIN: ${{ vars.HOMEBREW_BOTTLE_DOMAIN }}
HOMEBREW_API_DOMAIN: ${{ vars.HOMEBREW_API_DOMAIN }}
@@ -94,7 +95,7 @@ jobs:
- name: Generate Version and Tags
id: gen-version
env:
- BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:stable' }}
+ BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3' }}
run: |
set -euo pipefail
@@ -102,7 +103,13 @@ jobs:
FEDORA_VERSION=$(sudo podman run --rm --entrypoint /usr/bin/rpm "${BASE_IMAGE}" -E %fedora)
VERSION_BASE="${FEDORA_VERSION}.$(date -u +%Y%m%d)"
- if [[ "${GITHUB_REF_NAME}" == "testing" ]]; then
+ if [[ "${GITHUB_REF_NAME}" == "testing-candidate" ]]; then
+ DEFAULT_TAG="testing-candidate"
+ VERSION_TAG="testing-candidate-${VERSION_BASE}"
+ VERSION_PRETTY="Testing candidate (F${VERSION_BASE})"
+ IMAGE_BRANCH="testing-candidate"
+ ALIAS_TAGS="${VERSION_TAG} testing-candidate testing-candidate-${FEDORA_VERSION}"
+ elif [[ "${GITHUB_REF_NAME}" == "testing" ]]; then
DEFAULT_TAG="testing"
VERSION_TAG="testing-${VERSION_BASE}"
VERSION_PRETTY="Testing (F${VERSION_BASE})"
@@ -137,7 +144,7 @@ jobs:
id: build-image
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:stable' }}
+ BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3' }}
FLATPAK_REMOTE_URL: ${{ vars.FLATPAK_REMOTE_URL }}
HOMEBREW_BOTTLE_DOMAIN: ${{ vars.HOMEBREW_BOTTLE_DOMAIN }}
HOMEBREW_API_DOMAIN: ${{ vars.HOMEBREW_API_DOMAIN }}
@@ -194,14 +201,14 @@ jobs:
# They publish default-branch builds and manual testing branch builds.
- name: Login to GitHub Container Registry
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
- if: github.event_name != 'pull_request' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'testing')
+ if: github.event_name != 'pull_request' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'testing' || github.ref_name == 'testing-candidate')
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Push To GHCR
- if: github.event_name != 'pull_request' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'testing')
+ if: github.event_name != 'pull_request' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'testing' || github.ref_name == 'testing-candidate')
id: push-image
env:
ALIAS_TAGS: ${{ steps.gen-build-tags.outputs.alias_tags }}
@@ -222,14 +229,14 @@ jobs:
# to consume. For more details, review the image signing section of the README.
- name: Install Cosign
uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
- if: github.event_name != 'pull_request' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'testing')
+ if: github.event_name != 'pull_request' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'testing' || github.ref_name == 'testing-candidate')
# https://github.com/containers/container-libs/issues/388
with:
cosign-release: 'v2.6.3'
- name: Sign container image
id: sign-image
- if: github.event_name != 'pull_request' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'testing')
+ if: github.event_name != 'pull_request' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'testing' || github.ref_name == 'testing-candidate')
env:
COSIGN_EXPERIMENTAL: false
COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
@@ -243,7 +250,8 @@ jobs:
needs: [build_push]
if: github.event_name != 'pull_request' &&
(github.ref_name == github.event.repository.default_branch ||
- github.ref_name == 'testing')
+ github.ref_name == 'testing' ||
+ github.ref_name == 'testing-candidate')
permissions:
contents: write
secrets: inherit
diff --git a/Containerfile b/Containerfile
index 9eb1b28..e9cedc9 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,5 +1,5 @@
# Allow build scripts to be referenced without being copied into the final image
-ARG BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:stable"
+ARG BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3"
FROM scratch AS ctx
COPY build_files /
@@ -10,12 +10,12 @@ FROM ${BASE_IMAGE}
ARG BASE_IMAGE
ARG IMAGE_NAME="aerocore-os"
ARG IMAGE_VENDOR="aerocore-io"
-ARG IMAGE_BRANCH="stable"
+ARG IMAGE_BRANCH="testing-candidate"
ARG VERSION_TAG="latest"
ARG VERSION_PRETTY="latest"
ARG OSTREE_IMAGE_REF=""
## Other possible base images include:
-# ghcr.io/ublue-os/bazzite-deck:testing
+# ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3
# ghcr.io/ublue-os/bazzite-deck:stable-44.20260820
### [IM]MUTABLE /opt
diff --git a/Justfile b/Justfile
index 9a9c75a..bf8e217 100644
--- a/Justfile
+++ b/Justfile
@@ -8,10 +8,10 @@ export image_keywords := env_var("IMAGE_KEYWORDS")
export image_logo_url := env_var("IMAGE_LOGO_URL")
export default_tag := env_var("DEFAULT_TAG")
export bib_image := env_var("BIB_IMAGE")
-export IMAGE_BRANCH := env_var_or_default("IMAGE_BRANCH", "stable")
+export IMAGE_BRANCH := env_var_or_default("IMAGE_BRANCH", "testing-candidate")
export VERSION_TAG := env_var_or_default("VERSION_TAG", default_tag)
export VERSION_PRETTY := env_var_or_default("VERSION_PRETTY", VERSION_TAG)
-export BASE_IMAGE := env_var_or_default("BASE_IMAGE", "ghcr.io/ublue-os/bazzite-deck:stable")
+export BASE_IMAGE := env_var_or_default("BASE_IMAGE", "ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3")
export OSTREE_IMAGE_REF := env_var_or_default("OSTREE_IMAGE_REF", "ostree-image-signed:docker://ghcr.io/" + repo_organization + "/" + image_name)
export LIVE_BASE_IMAGE := env_var_or_default("LIVE_BASE_IMAGE", "quay.io/fedora/fedora-kinoite:44")
export TITANOBOA_REPOSITORY := env_var_or_default("TITANOBOA_REPOSITORY", "https://github.com/Zeglius/titanoboa.git")
diff --git a/image-template.env b/image-template.env
index f210b06..313db5b 100644
--- a/image-template.env
+++ b/image-template.env
@@ -16,7 +16,7 @@ BIB_IMAGE="quay.io/centos-bootc/bootc-image-builder:latest"
# Keep this on bazzite-deck for Steam Deck, game mode, and handheld customizations.
# Use a concrete tag during transition windows if stable/testing moves underneath you.
-BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:stable"
+BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3"
# Optional mirror settings.
FLATPAK_REMOTE_URL=""
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-22 15:00:12 +0000