Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: enable f39 builds #500

Merged
merged 7 commits into from
Sep 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
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ jobs:
matrix:
image_flavor: [main, nvidia]
base_name: [bluefin, bluefin-dx]
major_version: [38]
major_version: [38, 39]
include:
- major_version: 38
is_latest_version: true
is_stable_version: true
- major_version: 39
is_latest_version: true
is_stable_version: false
steps:
# Checkout push-to-registry action GitHub repository
- name: Checkout Push to Registry action
Expand Down
10 changes: 6 additions & 4 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ COPY etc/yum.repos.d/ /etc/yum.repos.d/
COPY packages.json /tmp/packages.json
COPY build.sh /tmp/build.sh

# gnome-vrr
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland
RUN rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
# Exclude gnome-vrr from F39
RUN if grep -qv "39" <<< "${FEDORA_MAJOR_VERSION}"; then \
wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland && \
rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo \
; fi

## bootc
RUN wget https://copr.fedorainfracloud.org/coprs/rhcontainerbot/bootc/repo/fedora-"${FEDORA_MAJOR_VERSION}"/bootc-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/bootc.repo
Expand Down
2 changes: 1 addition & 1 deletion dx/etc/yum.repos.d/docker-ce.repo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[docker-ce-stable]
name=Docker CE Stable - $basearch
baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/stable
baseurl=https://download.docker.com/linux/fedora/38/$basearch/stable
enabled=1
gpgcheck=1
gpgkey=https://download.docker.com/linux/fedora/gpg
14 changes: 14 additions & 0 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,19 @@
],
"bluefin-dx": []
}
},
"39": {
"include": {
"bluefin": [],
"bluefin-dx": [],
"bluefin-framework": []
},
"exclude": {
"bluefin": [
"podman-docker"
],
"bluefin-dx": [],
"bluefin-framework": []
}
}
}