Skip to content
This repository has been archived by the owner on Mar 24, 2024. It is now read-only.

feat(ci): Enable images based on Fedora 39 #39

Merged
merged 3 commits into from
Oct 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build and Push Image
on:
pull_request:
merge_group:
merge_group:
schedule:
- cron: '20 22 * * *' # 10:20pm everyday
workflow_dispatch:
Expand All @@ -21,12 +21,17 @@ jobs:
fail-fast: false
matrix:
image_flavor: [main, nvidia]
major_version: [38]
major_version: [38, 39]
include:
- major_version: 39
is_latest_version: true
is_stable_version: false
is_gts_version: false
- major_version: 38
is_latest_version: true
is_stable_version: true
steps:
is_gts_version: true
steps:
# Checkout push-to-registry action GitHub repository
- name: Checkout Push to Registry action
uses: actions/checkout@v4
Expand Down Expand Up @@ -63,6 +68,8 @@ jobs:
if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \
[[ "${{ matrix.is_stable_version }}" == "true" ]]; then
BUILD_TAGS+=("latest")
elif [[ "${{ matrix.is_gts_version }}" == "true" ]]; then
BUILD_TAGS+=("gts")
fi

if [[ "${{ github.event_name }}" == "pull_request" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-base}"
ARG IMAGE_FLAVOR="${IMAGE_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 builder

Expand Down
14 changes: 12 additions & 2 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
"pipewire-pulseaudio",
"powerline",
"qgnomeplatform-qt5",
"raw-thumbnailer",
"redshift-gtk",
"sane-backends-drivers-scanners",
"setroubleshoot",
Expand Down Expand Up @@ -78,6 +77,7 @@
"37": {
"include": {
"all": [
"raw-thumbnailer"
]
},
"exclude": {
Expand All @@ -86,11 +86,21 @@
},
"38": {
"include": {
"all": []
"all": [
"raw-thumbnailer"
]
},
"exclude": {
"all": [
]
}
},
"39": {
"include": {
"all": []
},
"exclude": {
"all": []
}
}
}