Skip to content
This repository was archived by the owner on Jun 17, 2026. It is now read-only.
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
18 changes: 15 additions & 3 deletions .github/pull.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
version: "1"
rules:
- base: main
upstream: ublue-os:main
mergeMethod: merge
- base: stable-f44
upstream: main
mergeMethod: hardreset
mergeUnstable: false
reviewers:
- NiHaiden
- inffy
- ledif
- renner0e
conflictReviewers:
- NiHaiden
- inffy
- ledif
- renner0e
label: "stable-promotion"
conflictLabel: "promotion-conflict"
15 changes: 12 additions & 3 deletions .github/workflows/cherry-pick-to-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
if: |
github.event.pull_request.merged == true &&
contains(github.event.pull_request.labels.*.name, 'cherry-pick')

runs-on: ubuntu-slim

steps:
- name: Generate a GitHub App Token
id: generate-token
Expand All @@ -29,7 +29,7 @@ jobs:
# Use the dynamically generated GitHub App token
token: ${{ steps.generate-token.outputs.token }}
fetch-depth: 0

- name: Configure Git Author
run: |
git config --global user.name "aurora-backport-bot[bot]"
Expand All @@ -41,3 +41,12 @@ jobs:
# Use the dynamically generated GitHub App token here too
github_token: ${{ steps.generate-token.outputs.token }}
target_branches: "stable-f44"
pull_description: |
This is an automated backport of PR #${pull_number} to `${target_branch}`.

**_Please review the changes._**

### Original PR Description:
${pull_description}


4 changes: 3 additions & 1 deletion build_files/base/01-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ echo "::group:: ===$(basename "$0")==="

set -ouex pipefail

echo "Install really important packages here"

# may break when partially upgraded
dnf versionlock add "qt6-*" "plasma-desktop"

Expand Down Expand Up @@ -198,7 +200,7 @@ dnf -y swap \
# dnf5 upgrade --refresh --advisory=FEDORA-2024-dd2e9fb225
#fi

echo "Important thing"
echo "Important thing!!!"

# https://invent.kde.org/plasma/plasma-setup/-/issues/72
dnf -y swap --repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
Expand Down
4 changes: 3 additions & 1 deletion build_files/base/20-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ echo "::group:: ===$(basename "$0")==="

set -eoux pipefail

echo "THIS IS A TEST"

# We need to have the ublue-os signing keys on the image!
# Published images without these keys won't be able to pull ghcr.io/ublue-os/*
# and can therefore not update!
Expand Down Expand Up @@ -56,7 +58,7 @@ desktop-file-validate \
/usr/share/applications/dev.getaurora.boot-to-windows.desktop \
/usr/share/applications/dev.getaurora.offline-docs.desktop \
/usr/share/applications/dev.getaurora.documentation.desktop \
/usr/share/applications/dev.getaurora.system-update.desktop
/usr/share/applications/dev.getaurora.system-update.desktop

# Check for KDE Plasma version mismatch
# Fedora Repos have gotten the newer one, trying to upgrade
Expand Down
Loading