Merge updates from master

This commit is contained in:
Repository mirror & CI committed 2026-09-07 10:31:04 +00:00
commit a7d3c0f4ed
11 files changed
+354 -5

No files matched your search

+54
View File
@@ -0,0 +1,54 @@
name: duplicates
on:
schedule:
- cron: '0 12 * * *'
push:
branches: [dev]
pull_request:
branches: [dev]
env:
REPO_OWNER: "gentoo"
REPO_NAME: "guru"
REPO_WORKFLOW: "duplicates.yml"
IRC_NICK: "guru-ci"
IRC_HOST: "irc.libera.chat"
IRC_PORT: "6697"
IRC_CHANNEL: "#gentoo-guru"
jobs:
build:
runs-on: codeberg-tiny-lazy
steps:
- name: Check out repository
uses: actions/checkout@v6
- name: Prepare job
run: |
LAST_STATUS=$(python ./scripts/last_status.py)
IRC_NOTIFY=${{ forgejo.repository == 'gentoo/guru' && forgejo.event_name != 'pull_request' }}
echo "last_status=${LAST_STATUS}" >> "${FORGEJO_ENV}"
echo "irc_notify=${IRC_NOTIFY}" >> "${FORGEJO_ENV}"
- name: Setup master gentoo repository
run: |
./scripts/setup-master-gentoo.sh
- name: Check for duplicates
run: |
./scripts/check-duplicates.sh
- name: Inform failure on IRC
if: ${{ failure() && env.last_status == 'success' && fromJSON(env.irc_notify) }}
run: |
python ./scripts/irc_notify.py
env:
IRC_MESSAGE: CI failure detected on job ${{ forgejo.workflow }} - ${{ forgejo.server_url }}/${{ forgejo.repository }}/actions/runs/${{ forgejo.run_number }}
- name: Inform recovery on IRC
if: ${{ success() && env.last_status != 'success' && fromJSON(env.irc_notify) }}
run: |
python ./scripts/irc_notify.py
env:
IRC_MESSAGE: CI on job ${{ forgejo.workflow }} is green again. Thanks!
+60
View File
@@ -0,0 +1,60 @@
name: emails
on:
push:
branches: [dev]
pull_request:
branches: [dev]
defaults:
run:
shell: bash
env:
REPO_OWNER: "gentoo"
REPO_NAME: "guru"
REPO_WORKFLOW: "emails.yml"
IRC_NICK: "guru-ci"
IRC_HOST: "irc.libera.chat"
IRC_PORT: "6697"
IRC_CHANNEL: "#gentoo-guru"
jobs:
bugzilla:
runs-on: codeberg-tiny-lazy
steps:
- name: Checkout repo
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Get compare commit
run: |
COMMIT=$(python ./scripts/last_successful_commit.py)
echo "last_successful_commit=${COMMIT}" >> "${FORGEJO_ENV}"
echo "Last successful commit: ${COMMIT}"
if git rev-parse --verify "${COMMIT}^{commit}" > /dev/null; then
echo -e "\033[92m\u2713 ${COMMIT:0:7} points to a valid commit"
VALID=true
else
echo -e "\033[91m\u2717 ${COMMIT:0:7} doesn't point to a valid commit"
VALID=false
fi
echo "is_commit_valid=${VALID}" >> "${FORGEJO_ENV}"
- name: Get changed files
if: ${{ fromJSON(env.is_commit_valid) }}
run: |
git diff --diff-filter d --name-only ${last_successful_commit} -- '*/metadata.xml' | tr '\n' ' ' | tee all_changed_files.txt
- name: Check emails against Bugzilla
if: ${{ fromJSON(env.is_commit_valid) }}
run: |
python ./scripts/email-checker.py < all_changed_files.txt
- name: Inform on IRC
if: ${{ failure() && forgejo.repository == 'gentoo/guru' && forgejo.event_name == 'push' }}
run: |
python ./scripts/irc_notify.py
env:
IRC_MESSAGE: CI failure detected on job ${{ forgejo.workflow }} - ${{ forgejo.server_url }}/${{ forgejo.repository }}/actions/runs/${{ forgejo.run_number }}
+66
View File
@@ -0,0 +1,66 @@
name: pkgcheck
on:
schedule:
- cron: '0 12 * * *'
push:
branches: [dev]
pull_request:
branches: [dev]
env:
REPO_OWNER: "gentoo"
REPO_NAME: "guru"
REPO_WORKFLOW: "pkgcheck.yml"
IRC_NICK: "guru-ci"
IRC_HOST: "irc.libera.chat"
IRC_PORT: "6697"
IRC_CHANNEL: "#gentoo-guru"
jobs:
build:
# codeberg-tiny has a max runtime of 2min, but this usually isn't
# enough time for pkgcheck to do its thing, so use -medium (10min).
runs-on: codeberg-medium-lazy
container:
# At time of writing, the default image for codeberg-tiny-lazy is
# ghcr.io/catthehacker/ubuntu, which has bash 5.2.21. However,
# EAPI 9 requires bash >= 5.3. pkgcheck has an official image
# though! (albeit on github...)
image: ghcr.io/pkgcore/pkgcheck
steps:
# You need nodejs for actions/checkout. Yes, really.
- name: Install necessary packages
run: |
apk add nodejs
- name: Check out repository
uses: actions/checkout@v6
- name: Prepare job
run: |
LAST_STATUS=$(python ./scripts/last_status.py)
IRC_NOTIFY=${{ forgejo.repository == 'gentoo/guru' && forgejo.event_name != 'pull_request' }}
echo "last_status=${LAST_STATUS}" >> "${FORGEJO_ENV}"
echo "irc_notify=${IRC_NOTIFY}" >> "${FORGEJO_ENV}"
- name: Run pkgcheck
run: |
./scripts/pkgcheck.sh
env:
PKGCHECK_ARGS: "--keywords=-RedundantVersion,-NonsolvableDepsInDev"
- name: Inform failure on IRC
if: ${{ failure() && env.last_status == 'success' && fromJSON(env.irc_notify) }}
run: |
python ./scripts/irc_notify.py
env:
IRC_MESSAGE: CI failure detected on job ${{ forgejo.workflow }} - ${{ forgejo.server_url }}/${{ forgejo.repository }}/actions/runs/${{ forgejo.run_number }}
- name: Inform recovery on IRC
if: ${{ success() && env.last_status != 'success' && fromJSON(env.irc_notify) }}
run: |
python ./scripts/irc_notify.py
env:
IRC_MESSAGE: CI on job ${{ forgejo.workflow }} is green again. Thanks!
+2
View File
@@ -1,4 +1,6 @@
DIST eden-0.2.0-fix-httplib-version.patch 901 BLAKE2B 5eccfe3398a5ec7bc746b4570b0902f145d3618be2a0bd446d6a3ea61763e6fad471ad1b45d242925c78b04cb33bd7152c86741334ba922ab1a2cfbb32629f3c SHA512 f68a62674828205bc48482ab1e3774f73ecd94c1f6df9c1000d5123b170d1d476a01aa5453d6abb8ff2012e86e7a810d0ecbf3fc985f293725e4ccaf9c598f75
DIST eden-0.2.0.tar.gz 11360348 BLAKE2B 13b35c5a60df6a8413483c1b9752ec86fdff02afda0e4635a3e2b00019479b3717fd372051650538a3b231979f95c53c5eaeef4fe9b9667364c75fe7c284b84c SHA512 bbfc790ea293ee478a0447a9702029f4bdfd536d9c06996bcf1c069f8a508c88d164de0483f40e9a5340af773c39f20cd9b63b01e489415170d9c9b0728a0c7f
DIST eden-0.2.1-fix-newer-httplib-compilation.patch 1946 BLAKE2B 48fce65207a6b8fe828b0bf6513ab92aefd72171d7a48aafcbe6791ff878c57b528feb1583aec15672e6b996a9d1646b3503589d3536f716c5d22981b5c2cd67 SHA512 df4021669db04685986ca817ca1ca565d2029989763f9499c1e600f5277425f1afce9c61da24595ac44046e7b92b02fa22bf5617e1b9f962a3de9543563fbd7c
DIST eden-0.2.1-fix-wifi-scanner-compilation.patch 1615 BLAKE2B e2f66d9b822a424ae774ee16a407f2677ce996923f13bfebb77cda11bb491a89cfe8a36df4e665d7b8e3f0f6c1ab61088502932238d797b4c19ca30dd025a0e2 SHA512 7e7efbf7ca9394b07ef7d2540f754eae949b8638ea3cf38737b9319ced6b85ae102b6fcab9f8ddc2ae77981b32a49289ea516ea2d4e9997f54dc570cdc038172
DIST eden-0.2.1.tar.gz 11484603 BLAKE2B 465cbc7737ebd2b49209b2e48f5626538d92e2fdb267173c8f864c457e9fb6f942d1dd28b21a7c41ed17b42d6c93740c9debf46c68b01bcfd07ef553e6ea1116 SHA512 7c7f0fc296442b62909ecdf5341ece88fc5e7c1bec7ebc2f9c6808e5672e4147f52f99f92c8866285af57a5d0b97ecacd9ab31c461064f35581e7734f14b7d7e
DIST nx-tzdb-121125.tar.gz 102895 BLAKE2B 6619b7ad2200be8efb495773d017a07985adb7b05ba97285427aa86103ae9a8c9befc698709539a0292c413c2c8082c39fd699e181140e6879844084e5c19382 SHA512 dc37a189a44ce8b5c988ca550582431a6c7eadfd3c6e709bee6277116ee803e714333e85c9e6cbb5c69346a14d6f2cc7ed96e8aa09cc5fb8a89f945059651db6
+10 -1
View File
@@ -15,7 +15,16 @@ if [[ "${PV}" == 9999 ]]; then
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
else
KEYWORDS="~amd64 ~arm64"
SRC_URI="https://git.eden-emu.dev/eden-emu/eden/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
SRC_URI="
https://git.eden-emu.dev/eden-emu/eden/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
https://git.eden-emu.dev/eden-emu/eden/pulls/4278.patch -> ${PN}-0.2.1-fix-newer-httplib-compilation.patch
https://git.eden-emu.dev/eden-emu/eden/pulls/4279.patch -> ${PN}-0.2.1-fix-wifi-scanner-compilation.patch
"
PATCHES=(
"${DISTDIR}/${PN}-0.2.1-fix-newer-httplib-compilation.patch"
"${DISTDIR}/${PN}-0.2.1-fix-wifi-scanner-compilation.patch"
)
fi
_TZDB_VER=121125
+1 -1
View File
@@ -1 +1 @@
DIST klassy-6.5.3.tar.gz 44188448 BLAKE2B fbd6c211fca55d8787efa735b2401e2aa2930ff6fc13950a43e23b636a14986cbacd62e47e46f8523aa3be2a950296f22db039328b42fb5cb6e2a0c04101c2b3 SHA512 e5834eaf1d69fa680e5857b73622e5124a2271eae086d8f3ccb49e0e57d539af88b373daf047ffd57f740ad3b2960be32af60448724d4dbf7fdccca8a0b689de
DIST klassy-6.7.1.tar.gz 48529187 BLAKE2B 43c8437a139a708e235793d1f1513abf9891d8e0085a6e17b73635f56f933dcdc6f6afd4f593cf04b6be93204ba28b601507fb817d19656a70ce03bea1050425 SHA512 ed8d9e66a60766441ba2f05a28bc40bd60ab42165d821414e3d2b3776f67f2f07d3038bc50ea00baf17698e89e6cba7ddd087c39fc9a6fc5e25b63d7c42efb1f
@@ -3,12 +3,12 @@
EAPI=8
KFMIN=6.10.0
QTMIN=6.6.0
KFMIN=6.22.0
QTMIN=6.10.0
inherit cmake xdg
DESCRIPTION="Klassy QT6 window decoration theme for KDE Plasma 6.3+"
DESCRIPTION="Klassy QT6 window decoration theme for KDE Plasma 6.6.1+"
HOMEPAGE="https://github.com/paulmcauley/klassy"
SRC_URI="https://github.com/paulmcauley/klassy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+52
View File
@@ -0,0 +1,52 @@
#!/usr/bin/env python3
# A quick and dirty Python script to send a message to an IRC channel.
import os
import socket
import ssl
nick = bytes(os.getenv("IRC_NICK", "notguru-cicd"), "ascii")
host = os.getenv("IRC_HOST", "irc.libera.chat")
port = int(os.getenv("IRC_PORT", "6697"))
channel = bytes(os.getenv("IRC_CHANNEL", "##notgentoo-guru"), "ascii")
message = bytes(os.getenv("IRC_MESSAGE", "Howdy!"), "ascii")
context = ssl.create_default_context()
def main():
print("Connecting to IRC network...")
sock = socket.create_connection((host, port))
ssock = context.wrap_socket(sock, server_hostname=host)
# Let the server speak up first before we send anything
buf = ssock.recv()
if len(buf) == 0:
raise Exception("Unexpected disconnect")
# Identify ourselves to the server, then join a channel to send a message.
# We send VERSION last since the response (351) is predictable and used as
# an indicator that everything was received.
print("Sending commands...")
command = (
b"NICK " + nick + b"\n" +
b"USER " + nick + b" 0 0 :" + nick + b"\n" +
b"JOIN " + channel + b"\n" +
b"PRIVMSG " + channel + b" :" + message + b"\n" +
b"VERSION\n"
)
ssock.sendall(command)
print("Waiting for response...")
while True:
buf = ssock.recv()
if len(buf) == 0:
raise Exception("Unexpected disconnect")
lines = buf.split(b"\n")
for line in lines:
parts = line.split()
if len(parts) > 1 and parts[1] == b"351":
print("Message sent!")
return
main()
+35
View File
@@ -0,0 +1,35 @@
#!/usr/bin/env python3
# Quick and dirty Python script to replace the behavior of a `gh`
# command that got the last CI/CD status of a given workflow.
import http.client
import json
import os
host = "codeberg.org"
owner = os.getenv("REPO_OWNER")
name = os.getenv("REPO_NAME")
workflow = os.getenv("REPO_WORKFLOW")
path = (
f"/api/v1/repos/{owner}/{name}/actions/runs/?workflow_id={workflow}"
"&page=1&limit=1"
)
def main():
conn = http.client.HTTPSConnection(host)
conn.request("GET", path)
response = conn.getresponse()
if response.status != 200:
print(f"Didn't get 200 OK! Got {response.status} instead.")
print(
"The response body may be helpful: "
f"{response.read().decode('utf-8')}"
)
exit(1)
j = json.loads(response.read())
# The first workflow run should be the most recent one
print(j["workflow_runs"][0]["status"])
main()
+40
View File
@@ -0,0 +1,40 @@
#!/usr/bin/env python3
# Similar to last_status.py, this is just a script to replace the `gh`
# cli behavior with the forgejo/codeberg equivalent. Gets the last
# commit that had a successful run for the given job.
import http.client
import json
import os
host = "codeberg.org"
owner = os.getenv("REPO_OWNER")
name = os.getenv("REPO_NAME")
workflow = os.getenv("REPO_WORKFLOW")
path = (
f"/api/v1/repos/{owner}/{name}/actions/runs/?workflow_id={workflow}"
f"&status=success&page=1&limit=1"
)
def main():
conn = http.client.HTTPSConnection(host)
conn.request("GET", path)
response = conn.getresponse()
if response.status != 200:
print(f"Didn't get 200 OK! Got {response.status} instead.")
print(
"The response body may be helpful: "
f"{response.read().decode('utf-8')}"
)
exit(1)
j = json.loads(response.read())
# If run has literally never succeeded before, assume failure
if j["total_count"] == 0:
print("none") # this'll cause VALID=false later?
else:
# The first workflow run should be the most recent one
print(j["workflow_runs"][0]["commit_sha"])
main()
+31
View File
@@ -0,0 +1,31 @@
#!/usr/bin/env bash
# All of this is lifted from pkgcore/pkgcheck-action; please see [1] for
# the real brains behind this work. All I've done is moved the logic
# into a standalone bash script so that we're as forge-agnostic as
# possible.
# [1]: https://github.com/pkgcore/pkgcheck-action/graphs/contributors?all=1
# ::(end)group:: is used to mark sections of collapsible CI/CD logs.
runner() {
echo "::group::${1}"
shift 1
"$@"
local exit=$?
echo
echo "::endgroup::"
return $exit
}
runner "Sync gentoo repo" \
pmaint sync gentoo
runner "Update repo metadata" \
pmaint regen --dir ~/.cache/pkgcheck/repos .
runner "Marking workspace safe for git" \
git config --global --add safe.directory '*'
runner "Run pkgcheck" \
pkgcheck --color y ci --failures failures.json --exit GentooCI \
"${PKGCHECK_ARGS}"
scan_exit_status=$?
pkgcheck replay --color y failures.json
exit $scan_exit_status