Merge branch 'f38' into w/obs-studio-freeworld

This commit is contained in:
madomado
2023-06-25 09:49:50 +08:00
committed by GitHub
33 changed files with 196 additions and 114 deletions
+33 -47
View File
@@ -54,8 +54,19 @@ jobs:
- name: Set up git repository
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Build with Anda
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}
- name: Cache buildroot
id: br-cache
uses: actions/cache@v3
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
- name: Include custom build template instead of package default
run: |
cp -v anda/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
- name: Build with Andaman
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
- name: Generating artifact name
id: art
@@ -79,20 +90,20 @@ jobs:
- name: Notify Madoguchi (Success)
if: success() && github.event_name == 'push'
run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
- name: Notify Madoguchi (Failure)
if: ( cancelled() || failure() ) && github.event_name == 'push'
run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
- name: Lint RPMs and SRPMs
id: lint
if: success()
run: |
echo 'err=false' >> $GITHUB_ENV
echo 'LINT_ERR=false' >> $GITHUB_ENV
rpmlint anda-build/ > rpmlint.txt || f=1
if [[ $f -eq 1 ]]; then
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
echo "esc_lint_out<<$EOF" >> $GITHUB_ENV
echo "ESC_LINT_OUT<<$EOF" >> $GITHUB_ENV
cat rpmlint.txt | sed 's/`/\\`/g' >> $GITHUB_ENV
echo $EOF >> $GITHUB_ENV
echo "lint_out<<$EOF" >> $GITHUB_ENV
@@ -100,13 +111,14 @@ jobs:
cat rpmlint.txt >> $GITHUB_ENV
echo '```' >> $GITHUB_ENV
echo $EOF >> $GITHUB_ENV
echo 'err=true' >> $GITHUB_ENV
echo 'LINT_ERR=true' >> $GITHUB_ENV
fi
- name: Try to install package
id: dnf
if: success()
run: |
echo 'INSTALL_ERR=false' >> $GITHUB_ENV
touch out
for f in anda-build/rpm/rpms/*.rpm; do
dnf in --downloadonly -y $f > $f.dnfout.txt 2>&1 || fail=1
@@ -116,55 +128,29 @@ jobs:
cat $f.dnfout.txt >> out
echo '```' >> out
echo >> out
echo 'err=true' >> $GITHUB_ENV
echo 'INSTALL_ERR=true' >> $GITHUB_ENV
fi
done
cat out
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
echo "esc_dnf_out<<$EOF" >> $GITHUB_ENV
echo "ESC_DNF_OUT<<$EOF" >> $GITHUB_ENV
cat out | sed 's/`/\\`/g' >> $GITHUB_ENV
echo $EOF >> $GITHUB_ENV
echo "dnf_out<<$EOF" >> $GITHUB_ENV
cat out >> $GITHUB_ENV
echo $EOF >> $GITHUB_ENV
- name: Comment RPMLint/DNF output (PR)
if: success() && github.event_name == 'pull_request'
uses: actions/github-script@v6
with:
script: |
let out = "";
if (`${{ env.esc_lint_out }}`.trim() != "") {
out += "## 🔨 Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n";
out += `\`\`\`\n${{ env.esc_lint_out }}\n\`\`\`\n`;
}
if (`${{ env.esc_dnf_out }}`.trim() != "") {
out += "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n";
out += `${{ env.esc_dnf_out }}`;
}
if (out != "") {
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: out,
});
}
- name: Generate RPMLint/DNF summary
if: success()
run: |
# Remind me to make all of this not weird later ~ lleyton
- name: Create commit comment
if: success() && env.err == 'true'
uses: peter-evans/commit-comment@v1
with:
body: |
<sub>[run_id: ${{github.run_id}}](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})</sub>
# Built RPM: ${{matrix.pkg.pkg}} (${{matrix.pkg.arch}}.fc${{matrix.version}})
## Lint
If you see anything below, RPMLint returned with a non-zero exit code.
if [[ $LINT_ERR == "true" ]]; then
echo -e "## ❌ Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY
echo -e "```\n${{ env.ESC_LINT_OUT }}\n```\n" >> $GITHUB_STEP_SUMMARY
fi
${{ env.lint_out }}
## DNF
Output of `dnf in --downloadonly ...`.
If you see anything below, DNF returned with a non-zero exit code.
${{ env.dnf_out }}
if [[ $INSTALL_ERR == "true" ]]; then
echo -e "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY
echo "${{ env.ESC_DNF_OUT }}" >> $GITHUB_STEP_SUMMARY
fi
+10 -3
View File
@@ -36,8 +36,15 @@ jobs:
- name: Set up git repository
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Build with Anda
run: anda build ${{ matrix.pkg }}pkg --package rpm -c terra-${{ matrix.version }}-${{ matrix.arch }}
- name: Cache buildroot
id: br-cache
uses: actions/cache@v3
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
- name: Build with Andaman
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
- name: Generating artifact name
id: art
@@ -63,4 +70,4 @@ jobs:
run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
- name: Notify Madoguchi (Failure)
if: ( cancelled() || failure() ) && github.event_name == 'push'
run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+11 -4
View File
@@ -25,8 +25,15 @@ jobs:
- name: Set up git repository
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Build with Anda
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}
- name: Cache buildroot
id: br-cache
uses: actions/cache@v3
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
- name: Build with Andaman
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
- name: Generating artifact name
id: art
@@ -49,7 +56,7 @@ jobs:
- name: Notify Madoguchi (Success)
if: success() && github.event_name == 'push'
run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
- name: Notify Madoguchi (Failure)
if: ( cancelled() || failure() ) && github.event_name == 'push'
run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: discord-canary-openasar
Version: 0.0.160
Release: 2%{?dist}
Version: 0.0.161
Release: 1%{?dist}
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
+2 -2
View File
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: discord-canary
Version: 0.0.160
Release: 2%{?dist}
Version: 0.0.161
Release: 1%{?dist}
Summary: Free Voice and Text Chat for Gamers
URL: discord.com
Source0: https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: discord-ptb-openasar
Version: 0.0.42
Release: 2%{?dist}
Version: 0.0.43
Release: 1%{?dist}
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
+2 -2
View File
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: discord-ptb
Version: 0.0.42
Release: 2%{?dist}
Version: 0.0.43
Release: 1%{?dist}
Summary: Free Voice and Text Chat for Gamers.
URL: https://discord.com
Source0: https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
@@ -17,7 +17,7 @@ A full desktop environment for Linux/Unix using Fyne.}
%global godocs AUTHORS README.md CHANGELOG.md
Name: %{goname}
Release: %autorelease
Release: 1%{?dist}
Summary: A full desktop environment for Linux/Unix using Fyne
License: BSD-3-Clause
@@ -1,6 +1,6 @@
%global forgeurl https://github.com/KDE/latte-dock/
%global commit 4cc612284dd3ae76e2159cd846cf137fde802d52
%global commit 6532af166f2c6524827c8e1c22af6b9c2accc11f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
@@ -2,7 +2,7 @@
%global debug_package %{nil}
Name: iosevka-fusion-fonts
Version: 24.1.3
Version: 24.1.4
Release: 1%{?dist}
Summary: A custom font based on iosevka
-4
View File
@@ -1,4 +0,0 @@
*.tar.gz
*.zip
*.rpm
*.log
-3
View File
@@ -1,3 +0,0 @@
# manrope-fonts
Manrope modern geometric sans-serif, packaged for use in tauOS
+11 -14
View File
@@ -1,19 +1,20 @@
%global commit ffa0fdf363527c9993b8836cce48cd12bd2b81ba
Summary: A modernist sans serif font
Name: manrope-fonts
Version: 1
Release: 3%{?dist}
Version: 4.505
Release: 1%{?dist}
License: OFL-1.1
URL: https://manropefont.com/
URL: https://github.com/sharanda/manrope
Source0: https://manropefont.com/manrope.zip
Source1: README.md
Source0: %url/archive/%commit.tar.gz
BuildArch: noarch
%description
Manrope modern geometric sans-serif
%prep
yes A | %autosetup -c
%autosetup -n manrope-%commit
%build
@@ -23,24 +24,20 @@ install -pm 644 fonts/otf/*.otf %{buildroot}%{_datadir}/fonts/manrope
install -pm 644 fonts/ttf/*.ttf %{buildroot}%{_datadir}/fonts/manrope
install -pm 644 fonts/variable/Manrope* %{buildroot}%{_datadir}/fonts/manrope
install -pm 0644 %SOURCE1 README.md
# Install licenses
mkdir -p licenses
install -pm 0644 %SOURCE1 licenses/LICENSE
%files
%doc README.md
%doc documentation.html
%license licenses/LICENSE
%license OFL.txt
%{_datadir}/fonts/manrope/*
%changelog
* Thu Jun 22 2023 windowsboy111 <windowsboy111@fyralabs.com> - 4.505-1
- Bump version and fix sources
* Tue Jan 10 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 1-3
- Ported from tauOS
* Sat May 14 2022 Jamie Murphy <jamie@fyralabs.com> - 1-1
- Fix specfile
+8
View File
@@ -0,0 +1,8 @@
let readme = get("https://raw.githubusercontent.com/sharanda/manrope/master/README.md");
let ver = find("## Changelog\n- v (.+?) \\/", readme, 1);
if ver != find("Version:\\s*([\\d.]+)\n" rpm.f, 1) {
let req = new_req("https://api.github.com/repos/sharanda/manrope/commits/HEAD");
let sha = req.get().json().sha;
rpm.global("commit", sha);
rpm.version(ver);
}
@@ -1,6 +1,6 @@
Name: sarasa-gothic-fonts
Version: 0.41.2
Release: 2%{?dist}
Version: 0.41.3
Release: 1%{?dist}
URL: https://github.com/be5invis/Sarasa-Gothic
Source0: %url/releases/download/v%version/sarasa-gothic-ttc-%version.7z
Source1: %url/releases/download/v%version/sarasa-gothic-super-ttc-%version.7z
+1 -1
View File
@@ -2,7 +2,7 @@
%global debug_package %{nil}
Name: osu-lazer
Version: 2023.617.0
Version: 2023.621.0
Release: 1%{?dist}
Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
ExclusiveArch: x86_64
+1 -1
View File
@@ -3,7 +3,7 @@
%bcond_with tests
Name: apparmor
Version: 3.1.5
Version: 3.1.6
Release: 1%{?dist}
Summary: AppArmor userspace components
+2 -1
View File
@@ -1,4 +1,4 @@
%global libver 1.0.4
%global libver 1.0.4-5
# replace - with ~
%global libver_format %(v=%{libver}; sed -e 's/-/~/' <<< $v)
@@ -49,6 +49,7 @@ developing applications that use %{name}.
echo "#include <cstdint>" > a.h
cat src/libappimage/utils/hashlib.h >> a.h
mv a.h src/libappimage/utils/hashlib.h
rm docs/{make.bat,.gitignore}
%build
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: moby-compose
Version: 2.18.1
Version: 2.19.0
Release: 1%{?dist}
Summary: Define and run multi-container applications with Docker
+54 -9
View File
@@ -2,11 +2,15 @@ config_opts['root'] = 'terra-{{ releasever }}-{{ target_arch }}'
config_opts['dist'] = 'fc{{ releasever }}' # only useful for --resultdir variable subst
config_opts['macros']['%dist'] = '.fc{{ releasever }}'
config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
config_opts['package_manager'] = 'dnf'
config_opts['package_manager'] = 'dnf5'
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
config_opts['mirrored'] = True
config_opts['plugin_conf']['root_cache_enable'] = True
config_opts['plugin_conf']['yum_cache_enable'] = True
config_opts['plugin_conf']['ccache_enable'] = True
config_opts['plugin_conf']['ccache_opts']['compress'] = 'on'
# repos
config_opts['dnf.conf'] = """
dnf_conf = """
[main]
keepcache=1
@@ -37,13 +41,50 @@ enabled=1
enabled_metadata=1
metadata_expire=4h
[local]
name=local
baseurl=https://lapis.ultramarine-linux.org/kojifiles/repos/um{{ releasever }}-build/latest/$basearch/
cost=2000
enabled={{ not mirrored }}
skip_if_unavailable=False
assumeyes=True
# RPMFusion
# We do not check GPG keys, because I can't find a direct link to the GPG key
[rpmfusion-free]
name=RPM Fusion for Fedora $releasever - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
enabled=1
metadata_expire=14d
type=rpm-md
gpgcheck=0
repo_gpgcheck=0
[rpmfusion-free-updates]
name=RPM Fusion for Fedora $releasever - Free - Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
enabled=1
enabled_metadata=1
type=rpm-md
gpgcheck=0
repo_gpgcheck=0
[rpmfusion-nonfree]
name=RPM Fusion for Fedora $releasever - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
enabled=1
enabled_metadata=1
metadata_expire=14d
type=rpm-md
gpgcheck=0
repo_gpgcheck=0
[rpmfusion-nonfree-updates]
name=RPM Fusion for Fedora $releasever - Nonfree - Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
enabled=1
enabled_metadata=1
type=rpm-md
gpgcheck=0
repo_gpgcheck=0
{% if mirrored %}
[fedora]
@@ -177,3 +218,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
{% endif %}
"""
config_opts['dnf.conf'] = dnf_conf
config_opts['dnf5.conf'] = dnf_conf
+1 -1
View File
@@ -1,5 +1,5 @@
%global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
%global commit 2054f1c3a9c78ac13593e90845807e9e64f22553
%global commit 88114948c41f38d7366dc8d80abc09f00c2492fa
%global ver 1.9.5
%global debug_package %nil
+1 -1
View File
@@ -4,7 +4,7 @@
%define _build_id_links none
Name: sass
Version: 1.63.4
Version: 1.63.6
Release: 1%{?dist}
Summary: The reference implementation of Sass, written in Dart
License: MIT
+5
View File
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "uwufetch.spec"
}
}
+1
View File
@@ -0,0 +1 @@
rpm.version(gh("TheDarkBug/uwufetch"));
+33
View File
@@ -0,0 +1,33 @@
Name: uwufetch
Version: 2.1
Release: 1%?dist
Summary: A meme system info tool for Linux, based on nyan/uwu trend on r/linuxmasterrace.
License: GPL-3.0
URL: https://github.com/TheDarkBug/uwufetch
BuildRequires: make gcc git anda-srpm-macros
%description
A meme system info tool for (almost) all your Linux/Unix-based systems, based on the nyan/UwU trend on r/linuxmasterrace.
%prep
git clone https://github.com/TheDarkBug/uwufetch.git .
git checkout %{version}
%build
%make_build
%install
make install DESTDIR=%{?buildroot}%{_prefix}
mkdir %{?buildroot}%{_libdir}
mv %{?buildroot}%{_prefix}/lib/libfetch.so %{?buildroot}%{_libdir}/libfetch.so
rm -rf %{?buildroot}%{_includedir}
%files
%{_prefix}/lib/uwufetch/*
%{_libdir}/libfetch.so
%{_mandir}/man1/uwufetch.1.gz
%{_bindir}/uwufetch
%changelog
* Thu Jun 22 2023 Alyxia Sother <alyxia@riseup.net>
- Initial package.
+1 -1
View File
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: python3-ruff
Version: 0.0.272
Version: 0.0.275
Release: 1%{?dist}
Summary: An extremely fast Python linter, written in Rust
License: MIT
+1 -1
View File
@@ -2,7 +2,7 @@
%global crate felix
Name: rust-felix
Version: 2.4.0
Version: 2.4.1
Release: 1%{?dist}
Summary: Tui file manager with vim-like key mapping
+2 -2
View File
@@ -4,8 +4,8 @@
%global crate gitoxide
Name: rust-gitoxide
Version: 0.26.0
Release: %autorelease
Version: 0.27.0
Release: 1%{?dist}
Summary: Command-line application for interacting with git repositories
License: MIT OR Apache-2.0
+3 -4
View File
@@ -1,6 +1,6 @@
Name: youki
Version: 0.0.5
Release: 2%{?dist}
Version: 0.1.0
Release: 1%{?dist}
Summary: A container runtime written in Rust
License: Apache-2.0
@@ -49,8 +49,7 @@ pushd crates/
%install
install -D -m 0755 target/release/youki %{buildroot}%{_bindir}/youki
%fdupes %buildroot/usr/share/doc/youki/docs
rm %buildroot/usr/share/doc/youki/docs/.gitignore
%fdupes docs/
%files
%license LICENSE
+1 -1
View File
@@ -5,7 +5,7 @@
%global crate zellij
Name: rust-zellij
Version: 0.37.1
Version: 0.37.2
Release: 1%{?dist}
Summary: Terminal workspace with batteries included
+1 -1
View File
@@ -6,7 +6,7 @@
%endif
Name: electron
Version: 25.1.1
Version: 25.2.0
Release: 1%{?dist}
Summary: Build cross platform desktop apps with web technologies
License: MIT
+1 -1
View File
@@ -3,7 +3,7 @@
%global priority 90
%global real_name vala
%global commit 123a29b5838fb769f28e71f510f707f8d9bca7dc
%global commit e9a6d92c00b734ab689493b7fc1874db227067c7
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global repo https://gitlab.gnome.org/GNOME/%{real_name}.git