Skip to content

Commit

Permalink
Merge pull request #12 from ublue-os/main
Browse files Browse the repository at this point in the history
[pull] main from ublue-os:main
  • Loading branch information
pull[bot] authored Nov 26, 2024
2 parents 91d0d6a + 54dfc9d commit 3ddba18
Show file tree
Hide file tree
Showing 16 changed files with 520 additions and 37 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
is_latest_version: true
is_stable_version: true
kernel_flavor: bazzite # must match a kernel_flavor from akmods repo
kernel_version: 6.11.8-305.bazzite.fc41.x86_64 # must match a cached version of the above flavor
kernel_version: 6.11.9-303.bazzite.fc41.x86_64 # must match a cached version of the above flavor
exclude:
- base_name: bazzite
target_nvidia_flavor: nvidia
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
uses: ublue-os/remove-unwanted-software@v7

- name: Pull main, akmods, rechunk images
uses: Wandalen/wretry.action@v3.7.2
uses: Wandalen/wretry.action@v3.7.3
with:
attempt_limit: 3
attempt_delay: 15000
Expand All @@ -176,7 +176,7 @@ jobs:
- name: Get source versions
id: labels
uses: Wandalen/wretry.action@v3.7.2
uses: Wandalen/wretry.action@v3.7.3
with:
attempt_limit: 3
attempt_delay: 15000
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:

# Push the image to GHCR (Image Registry)
- name: Push To GHCR
uses: Wandalen/wretry.action@v3.7.2
uses: Wandalen/wretry.action@v3.7.3
id: push
if: github.event_name != 'pull_request'
with:
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/clean.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Cleanup Old Images
on:
schedule:
- cron: "15 0 * * 0" # 0015 UTC on Sundays
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}

jobs:
delete-older-than-90:
runs-on: ubuntu-latest
permissions:
packages: write
steps:
- name: Delete Images Older Than 90 Days
uses: dataaxiom/ghcr-cleanup-action@v1.0.13
with:
token: ${{ secrets.GITHUB_TOKEN }}
packages: bazzite,bazzite-ally-budgie,bazzite-asus-nvidia,bazzite-asus-nvidia-open,bazzite-budgie,bazzite-budgie-asus,bazzite-budgie-asus-nvidia,bazzite-budgie-nvidia,bazzite-budgie-surface,bazzite-budgie-surface-nvidia,bazzite-deck,bazzite-deck-budgie,bazzite-deck-gnome,bazzite-deck-gnome-nokmods,bazzite-deck-gnome-nvidia,bazzite-deck-nokmods,bazzite-deck-nvidia,bazzite-framegame-budgie,bazzite-gnome,bazzite-gnome-asus-nvidia,bazzite-gnome-asus-nvidia-open,bazzite-gnome-nokmods,bazzite-gnome-nvidia,bazzite-gnome-nvidia-open,bazzite-nokmods,bazzite-nvidia,bazzite-nvidia-open
older-than: 90 days
delete-orphaned-images: true
keep-n-tagged: 7
keep-n-untagged: 7
8 changes: 8 additions & 0 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,14 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
elfutils-libelf \
elfutils-libs \
|| true && \
rpm-ostree override replace \
--experimental \
--from repo=updates \
glibc \
glibc-common \
glibc-all-langpacks \
glibc-gconv-extra \
|| true && \
if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
rpm-ostree override replace \
--experimental \
Expand Down
11 changes: 8 additions & 3 deletions spec_files/bluez/bluez.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
%endif

Name: bluez
Version: 5.78
Version: 5.79
Release: 1%{?dist}.bazzite.{{{ git_dir_version }}}
Summary: Bluetooth utilities
License: GPL-2.0-or-later
Expand Down Expand Up @@ -266,6 +266,7 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_datadir}/dbus-1/system.d/bluetooth.conf
%{_datadir}/dbus-1/system-services/org.bluez.service
%{_unitdir}/bluetooth.service
%{_userunitdir}/mpris-proxy.service
%{_datadir}/zsh/site-functions/_bluetoothctl

%if %{with deprecated}
Expand Down Expand Up @@ -303,8 +304,9 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_mandir}/man1/l2ping.1.*
%{_mandir}/man1/rctest.1.*
%{_mandir}/man5/org.bluez.*.5.*
%{_mandir}/man7/hci.7.*
%{_mandir}/man7/l2cap.7.*
%{_mandir}/man7/rfcomm.7.*
%{_mandir}/man7/rfcomm.7.*
%{_libdir}/libbluetooth.so
%{_includedir}/bluetooth
%{_libdir}/pkgconfig/bluez.pc
Expand Down Expand Up @@ -337,6 +339,9 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_userunitdir}/obex.service

%changelog
* Sat Nov 02 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 5.79-1
- Update to 5.79

* Mon Sep 9 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 5.78-1
- Update to 5.78

Expand All @@ -347,7 +352,7 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
- Update to 5.77

* Thu Jul 04 2024 Bastien Nocera <bnocera@redhat.com> - 5.76-2
- Remove obsolete and ineffective configuration change
- Remove obsolete and ineffective configuration change

* Mon May 20 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 5.76-1
- Update to 5.76
Expand Down
Loading

0 comments on commit 3ddba18

Please sign in to comment.