Skip to content

Commit 78fb6e7

Browse files
authored
drop gnome 48 backport (#10)
* Refactor(HWE): replace kmods sig with coreos kernel (ublue-os#835) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: hanthor <5840441+hanthor@users.noreply.github.com> * chore(deps): update docker/metadata-action digest to 318604b (ublue-os#834) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [docker/metadata-action](https://redirect.github.com/docker/metadata-action) | action | digest | `c1e5197` -> `318604b` | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xNjkuNCIsInVwZGF0ZWRJblZlciI6IjQxLjE2OS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com> * Revert: Delete system_files/etc/tuned directory (ublue-os#840) Unnecessary config file, this is already set in centos * chore(deps): update quay.io/centos-bootc/centos-bootc:c10s docker digest to d8b4157 (ublue-os#839) This PR contains the following updates: | Package | Update | Change | |---|---|---| | quay.io/centos-bootc/centos-bootc | digest | `a084b73` -> `d8b4157` | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4yLjAiLCJ1cGRhdGVkSW5WZXIiOiI0Mi4yLjAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbXX0=--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com> * chore(deps): update softprops/action-gh-release digest to 5be0e66 (ublue-os#836) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [softprops/action-gh-release](https://redirect.github.com/softprops/action-gh-release) | action | digest | `6da8fa9` -> `5be0e66` | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xNzMuMSIsInVwZGF0ZWRJblZlciI6IjQxLjE3My4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com> * chore(deps): update github artifact actions (major) (ublue-os#821) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/download-artifact](https://redirect.github.com/actions/download-artifact) | action | major | `v5` -> `v6` | | [actions/upload-artifact](https://redirect.github.com/actions/upload-artifact) | action | major | `v4` -> `v5` | --- ### Release Notes <details> <summary>actions/download-artifact (actions/download-artifact)</summary> ### [`v6`](https://redirect.github.com/actions/download-artifact/compare/v5...v6) [Compare Source](https://redirect.github.com/actions/download-artifact/compare/v5...v6) </details> <details> <summary>actions/upload-artifact (actions/upload-artifact)</summary> ### [`v5`](https://redirect.github.com/actions/upload-artifact/compare/v4...v5) [Compare Source](https://redirect.github.com/actions/upload-artifact/compare/v4...v5) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xNTkuMiIsInVwZGF0ZWRJblZlciI6IjQxLjE1OS4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com> * chore(deps): update quay.io/centos-bootc/centos-bootc:c10s docker digest to 1d90c56 (ublue-os#843) This PR contains the following updates: | Package | Update | Change | |---|---|---| | quay.io/centos-bootc/centos-bootc | digest | `d8b4157` -> `1d90c56` | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4xMS4wIiwidXBkYXRlZEluVmVyIjoiNDIuMTEuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com> * drop gnome 48 backport
1 parent 4cb0adc commit 78fb6e7

File tree

6 files changed

+7
-28
lines changed

6 files changed

+7
-28
lines changed

.github/workflows/build-iso.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
iso
7777
- name: Upload to Job Artifacts
7878
if: github.event.inputs.upload-to-cloudflare == 'false' || github.event_name != 'workflow_dispatch'
79-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
79+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
8080
with:
8181
name: ${{ env.ARTIFACT_NAME }}
8282
if-no-files-found: error

.github/workflows/generate-changelog-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
7676
- name: Create Release
7777
if: steps.changelog.outputs.SKIP_CHANGELOG != 'true'
78-
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2
78+
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2
7979
with:
8080
name: ${{ steps.changelog.outputs.CHANGELOG_TITLE }}
8181
tag_name: ${{ steps.changelog.outputs.CHANGELOG_TAG }}
@@ -90,7 +90,7 @@ jobs:
9090
9191
- name: Upload changelog artifacts
9292
if: steps.changelog.outputs.SKIP_CHANGELOG != 'true'
93-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
93+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
9494
with:
9595
name: changelog-${{ matrix.version }}
9696
path: |

.github/workflows/reusable-build-image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ jobs:
291291
292292
- name: Upload Output Artifacts
293293
if: ${{ inputs.publish }}
294-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
294+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
295295
with:
296296
name: ${{ env.IMAGE_NAME }}-${{ matrix.platform }}
297297
retention-days: 1
@@ -357,7 +357,7 @@ jobs:
357357
echo "CENTOS_VERSION_NUMBER=${numbers_only}" >> "${GITHUB_ENV}"
358358
359359
- name: Image Metadata
360-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5
360+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5
361361
id: metadata
362362
with:
363363
tags: |
@@ -391,7 +391,7 @@ jobs:
391391
392392
- name: Fetch Build Outputs
393393
if: ${{ inputs.publish }}
394-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
394+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
395395
with:
396396
pattern: ${{ env.IMAGE_NAME }}-*
397397
merge-multiple: true

build_scripts/10-packages-image-base.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ dnf -y install 'dnf-command(versionlock)'
1212

1313
/run/context/build_scripts/scripts/kernel-swap.sh
1414

15-
# GNOME 48 backport COPR
16-
dnf copr enable -y "jreilly1821/c10s-gnome"
17-
dnf -y install glib2
18-
dnf -y upgrade glib2
19-
# Please, dont remove this as it will break everything GNOME related
20-
dnf versionlock add glib2
2115

2216
# This fixes a lot of skew issues on GDX because kernel-devel wont update then
2317
dnf versionlock add kernel kernel-devel kernel-devel-matched kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-uki-virt

image-versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ images:
22
- name: centos-bootc
33
image: quay.io/centos-bootc/centos-bootc
44
tag: c10s
5-
digest: sha256:a084b73d846ef83ec123a506a74205dc1d2e1b0535dec67686a382bb5edeba7e
5+
digest: sha256:1d90c56112a061b94ec83901d600799e7f7d240010412c8c9b4af10d75d81aa8

system_files/etc/tuned/ppd.conf

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)