Skip to content

Commit

Permalink
chore: Bump Fedora version to 41
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Brue <ryanbrue.dev@gmail.com>
  • Loading branch information
ryanabx committed Nov 12, 2024
1 parent 06d2b28 commit 6acac2d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
arch:
- amd64
version:
- 40
- 41
flavor:
- base
- base-nvidia
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
COMMIT_TAGS+=("${SHA_SHORT}${MAJOR_VERSION:+-$MAJOR_VERSION}")
BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION}-${{ matrix.arch }}" "${MAJOR_VERSION:+$MAJOR_VERSION-}${TIMESTAMP}" "${MAJOR_VERSION:+$MAJOR_VERSION-}${TIMESTAMP}-${{ matrix.arch }}")
# --
if [ "${MAJOR_VERSION}" == "40" ]; then
if [ "${MAJOR_VERSION}" == "41" ]; then
BUILD_TAGS+=("${TIMESTAMP}")
BUILD_TAGS+=("latest-${{ matrix.arch }}")
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
matrix:
image_name:
[cosmic, cosmic-nvidia, cosmic-silverblue, cosmic-silverblue-nvidia]
fedora_version: [40]
fedora_version: [41]
env:
IMAGE_TAG: ${{ matrix.fedora_version }}-amd64
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
Expand Down
4 changes: 2 additions & 2 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ARG SOURCE_IMAGE="${SOURCE_IMAGE:-base-main}"
ARG SOURCE_ORG="${SOURCE_ORG:-ghcr.io/ublue-os}"
ARG BASE_IMAGE="${SOURCE_ORG}/${SOURCE_IMAGE}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-41}"

FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION}
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-41}"

# Build in one step
RUN if [[ "${FEDORA_MAJOR_VERSION}" == "rawhide" ]]; then \
Expand Down

0 comments on commit 6acac2d

Please sign in to comment.