Skip to content

Commit

Permalink
Merge branch 'main' into switch-to-official-images
Browse files Browse the repository at this point in the history
  • Loading branch information
p5 authored Jan 4, 2025
2 parents 1729209 + 7aa0854 commit 3a513c9
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
packages: write
steps:
- name: Delete Images Older Than 90 Days
uses: dataaxiom/[email protected].13
uses: dataaxiom/[email protected].15
with:
token: ${{ secrets.GITHUB_TOKEN }}
packages: silverblue-main,kinoite-main,sericea-main,onyx-main,base-main,lazurite-main,vauxite-main
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ A common main image for all other uBlue images, with minimal (but important) adj
# Documentation

- [Main website](https://universal-blue.org)
- [Documentation](https://universal-blue.discourse.group/docs?category=4)
- [Scope document](https://universal-blue.discourse.group/t/universal-blue-project-governance/51)
- [Documentation](https://universal-blue.org/documentation.html)
- [Scope document](https://universal-blue.org/mission.html)
9 changes: 9 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ RELEASE="$(rpm -E %fedora)"
KERNEL_SUFFIX=""
QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(|'"$KERNEL_SUFFIX"'-)(\d+\.\d+\.\d+)' | sed -E 's/kernel-(|'"$KERNEL_SUFFIX"'-)//')"

# mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
# swap the incorrectly installed OpenCL-ICD-Loader for ocl-icd, the expected package
rpm-ostree override replace \
--from repo='fedora' \
--experimental \
--remove=OpenCL-ICD-Loader \
ocl-icd \
|| true

curl -Lo /etc/yum.repos.d/_copr_ublue-os_staging.repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${RELEASE}"/ublue-os-staging-fedora-"${RELEASE}".repo
curl -Lo /etc/yum.repos.d/_copr_kylegospo_oversteer.repo https://copr.fedorainfracloud.org/coprs/kylegospo/oversteer/repo/fedora-"${RELEASE}"/kylegospo-oversteer-fedora-"${RELEASE}".repo

Expand Down
6 changes: 6 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}

0 comments on commit 3a513c9

Please sign in to comment.