Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c5446a2d32 | ||
|
|
ab8fbf23ca | ||
|
|
353511b020 | ||
|
|
c123f3832d | ||
|
|
0b095e3826 | ||
|
|
b594047423 | ||
|
|
f94239c6a4 |
No files matched your search
+123
-34
@@ -9,12 +9,23 @@ on:
|
||||
description: Existing GitHub Release tag to rebuild
|
||||
required: true
|
||||
type: string
|
||||
publish_aur:
|
||||
description: Publish or refresh the AUR package metadata
|
||||
required: false
|
||||
default: false
|
||||
type: boolean
|
||||
only_aur:
|
||||
description: Skip package builds and only publish AUR metadata
|
||||
required: false
|
||||
default: false
|
||||
type: boolean
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
packages:
|
||||
conventional-packages:
|
||||
if: ${{ !inputs.only_aur }}
|
||||
runs-on: ubuntu-22.04
|
||||
env:
|
||||
RELEASE_TAG: ${{ github.event.release.tag_name || inputs.tag }}
|
||||
@@ -30,51 +41,129 @@ jobs:
|
||||
binutils-mingw-w64-x86-64 gcc libpipewire-0.3-dev \
|
||||
gcc-mingw-w64-x86-64 pkg-config zstd
|
||||
- name: Install nFPM
|
||||
uses: goreleaser/nfpm-action@v2
|
||||
with:
|
||||
version: latest
|
||||
env:
|
||||
NFPM_VERSION: 2.47.0
|
||||
run: |
|
||||
base="https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}"
|
||||
archive="nfpm_${NFPM_VERSION}_Linux_x86_64.tar.gz"
|
||||
curl -fsSLO "$base/$archive"
|
||||
curl -fsSLO "$base/checksums.txt"
|
||||
grep " $archive$" checksums.txt | sha256sum --check --strict
|
||||
sudo tar -xzf "$archive" -C /usr/local/bin nfpm
|
||||
nfpm --version
|
||||
- name: Build distribution packages
|
||||
run: ./packaging/build-packages.sh
|
||||
- name: Publish GitHub release assets
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
gh release upload "$RELEASE_TAG" \
|
||||
dist/*.tar.zst dist/*.deb dist/*.rpm dist/SHA256SUMS \
|
||||
--clobber
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: conventional-packages
|
||||
path: |
|
||||
dist/*.deb
|
||||
dist/*.rpm
|
||||
dist/*-linux-*.tar.zst
|
||||
if-no-files-found: error
|
||||
|
||||
aur:
|
||||
needs: packages
|
||||
arch-package:
|
||||
if: ${{ !inputs.only_aur }}
|
||||
runs-on: ubuntu-latest
|
||||
container: archlinux:base-devel
|
||||
if: ${{ github.event_name == 'release' }}
|
||||
env:
|
||||
RELEASE_TAG: ${{ github.event.release.tag_name }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ github.event.release.tag_name }}
|
||||
ref: ${{ github.event.release.tag_name || inputs.tag }}
|
||||
- name: Install Arch build dependencies
|
||||
run: |
|
||||
pacman -Syu --noconfirm \
|
||||
cargo rust gcc pkgconf pipewire \
|
||||
mingw-w64-gcc mingw-w64-binutils
|
||||
- name: Build native pacman package with makepkg
|
||||
run: |
|
||||
useradd --create-home builder
|
||||
chown -R builder:builder "$GITHUB_WORKSPACE"
|
||||
runuser -u builder -- bash -lc '
|
||||
cd "$1"
|
||||
CARGO_BUILD_JOBS=2 cargo build --release --locked
|
||||
./hook/build.sh
|
||||
./capture/build.sh
|
||||
./packaging/build-arch-package.sh "$1/dist"
|
||||
' _ "$GITHUB_WORKSPACE"
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: arch-package
|
||||
path: |
|
||||
dist/*.pkg.tar.zst
|
||||
!dist/uur-debug-*.pkg.tar.zst
|
||||
if-no-files-found: error
|
||||
|
||||
publish:
|
||||
needs: [conventional-packages, arch-package]
|
||||
if: ${{ !inputs.only_aur }}
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
RELEASE_TAG: ${{ github.event.release.tag_name || inputs.tag }}
|
||||
steps:
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: '*-package*'
|
||||
path: release-assets
|
||||
merge-multiple: true
|
||||
- name: Generate combined checksums
|
||||
working-directory: release-assets
|
||||
run: sha256sum -- *.deb *.rpm *.tar.zst > SHA256SUMS
|
||||
- name: Publish GitHub release assets
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: >-
|
||||
gh release upload "$RELEASE_TAG" release-assets/* --clobber
|
||||
--repo "$GITHUB_REPOSITORY"
|
||||
|
||||
aur:
|
||||
needs: publish
|
||||
runs-on: ubuntu-latest
|
||||
container: archlinux:base-devel
|
||||
if: >-
|
||||
${{ always() && (github.event_name == 'release' || inputs.publish_aur)
|
||||
&& (inputs.only_aur || needs.publish.result == 'success') }}
|
||||
env:
|
||||
RELEASE_TAG: ${{ github.event.release.tag_name || inputs.tag }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ github.event.release.tag_name || inputs.tag }}
|
||||
- name: Install publication tools
|
||||
run: pacman -Syu --noconfirm curl git openssh
|
||||
- name: Publish AUR metadata
|
||||
env:
|
||||
AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
|
||||
run: |
|
||||
install -Dm0600 /dev/null ~/.ssh/aur
|
||||
printf '%s\n' "$AUR_SSH_PRIVATE_KEY" > ~/.ssh/aur
|
||||
ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts
|
||||
git clone ssh://[email protected]/uur.git aur
|
||||
cp packaging/aur/PKGBUILD packaging/aur/uur.install aur/
|
||||
version="${RELEASE_TAG#v}"
|
||||
sed -i "s/^pkgver=.*/pkgver=$version/" aur/PKGBUILD
|
||||
source_url="https://github.com/${GITHUB_REPOSITORY}/archive/refs/tags/${RELEASE_TAG}.tar.gz"
|
||||
digest="$(curl -fsSL "$source_url" | sha256sum | cut -d' ' -f1)"
|
||||
sed -i "s/^sha256sums=.*/sha256sums=('$digest')/" aur/PKGBUILD
|
||||
useradd --create-home builder
|
||||
chown -R builder:builder aur
|
||||
runuser -u builder -- bash -lc 'cd "$1" && makepkg --printsrcinfo > .SRCINFO' _ "$PWD/aur"
|
||||
git -C aur config user.name uur-release-bot
|
||||
git -C aur config user.email [email protected]
|
||||
git -C aur add PKGBUILD uur.install .SRCINFO
|
||||
git -C aur commit -m "uur $version"
|
||||
GIT_SSH_COMMAND='ssh -i ~/.ssh/aur -o IdentitiesOnly=yes' git -C aur push
|
||||
install -d -o builder -g builder -m0700 /home/builder/.ssh
|
||||
printf '%s\n' "$AUR_SSH_PRIVATE_KEY" > /home/builder/.ssh/aur
|
||||
ssh-keyscan -H aur.archlinux.org > /home/builder/.ssh/known_hosts
|
||||
chown builder:builder /home/builder/.ssh/aur /home/builder/.ssh/known_hosts
|
||||
chmod 0600 /home/builder/.ssh/aur /home/builder/.ssh/known_hosts
|
||||
git_ssh='ssh -i /home/builder/.ssh/aur -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes -o UserKnownHostsFile=/home/builder/.ssh/known_hosts'
|
||||
runuser -u builder -- env \
|
||||
HOME=/home/builder \
|
||||
GIT_SSH_COMMAND="$git_ssh" \
|
||||
RELEASE_TAG="$RELEASE_TAG" \
|
||||
GITHUB_REPOSITORY="$GITHUB_REPOSITORY" \
|
||||
bash -lc '
|
||||
git clone ssh://[email protected]/uur.git "$HOME/aur"
|
||||
cp "$1/packaging/aur/PKGBUILD" "$1/packaging/aur/uur.install" "$HOME/aur/"
|
||||
cd "$HOME/aur"
|
||||
version="${RELEASE_TAG#v}"
|
||||
sed -i "s/^pkgver=.*/pkgver=$version/" PKGBUILD
|
||||
source_url="https://github.com/${GITHUB_REPOSITORY}/archive/refs/tags/${RELEASE_TAG}.tar.gz"
|
||||
digest="$(curl -fsSL "$source_url" | sha256sum | cut -d" " -f1)"
|
||||
sed -i "s/^sha256sums=.*/sha256sums=(\"$digest\")/" PKGBUILD
|
||||
makepkg --printsrcinfo > .SRCINFO
|
||||
git config user.name uur-release-bot
|
||||
git config user.email [email protected]
|
||||
git add PKGBUILD uur.install .SRCINFO
|
||||
if git diff --cached --quiet; then
|
||||
echo "AUR metadata is already current"
|
||||
exit 0
|
||||
fi
|
||||
git commit -m "uur $version"
|
||||
git push
|
||||
' _ "$GITHUB_WORKSPACE"
|
||||
Generated
+1
-1
@@ -1413,7 +1413,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uur"
|
||||
version = "0.1.0"
|
||||
version = "0.1.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"ashpd",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "uur"
|
||||
version = "0.1.0"
|
||||
version = "0.1.1"
|
||||
edition = "2021"
|
||||
description = "Native Linux companion for NetEase UU Remote: X11/Wayland input and capture, packaged as a regular desktop app"
|
||||
license = "MIT"
|
||||
|
||||
@@ -69,7 +69,7 @@ recipes and release artifacts share one version and filesystem layout.
|
||||
Install a downloaded release package with pacman:
|
||||
|
||||
```bash
|
||||
sudo pacman -U ./dist/uur-0.1.0-1-x86_64.pkg.tar.zst
|
||||
sudo pacman -U ./dist/uur-0.1.1-1-x86_64.pkg.tar.zst
|
||||
```
|
||||
|
||||
### AUR
|
||||
@@ -83,13 +83,13 @@ paru -S uur
|
||||
### Debian and Ubuntu package family
|
||||
|
||||
```bash
|
||||
sudo apt install ./uur_0.1.0_amd64.deb
|
||||
sudo apt install ./uur_0.1.1_amd64.deb
|
||||
```
|
||||
|
||||
### Fedora and compatible RPM systems
|
||||
|
||||
```bash
|
||||
sudo dnf install ./uur-0.1.0-1.x86_64.rpm
|
||||
sudo dnf install ./uur-0.1.1-1.x86_64.rpm
|
||||
```
|
||||
|
||||
On systems with different RPM dependency names, install the dependencies
|
||||
@@ -98,7 +98,7 @@ manually or use the portable archive.
|
||||
### Portable archive
|
||||
|
||||
```bash
|
||||
sudo tar --zstd -C / -xf ./uur-0.1.0-linux-x86_64.tar.zst
|
||||
sudo tar --zstd -C / -xf ./uur-0.1.1-linux-x86_64.tar.zst
|
||||
```
|
||||
|
||||
### Nix and NixOS
|
||||
|
||||
+4
-4
@@ -66,7 +66,7 @@ uur run
|
||||
使用 pacman 安装下载的正式发布包:
|
||||
|
||||
```bash
|
||||
sudo pacman -U ./dist/uur-0.1.0-1-x86_64.pkg.tar.zst
|
||||
sudo pacman -U ./dist/uur-0.1.1-1-x86_64.pkg.tar.zst
|
||||
```
|
||||
|
||||
### AUR
|
||||
@@ -80,13 +80,13 @@ paru -S uur
|
||||
### Debian、Ubuntu 及兼容发行版
|
||||
|
||||
```bash
|
||||
sudo apt install ./uur_0.1.0_amd64.deb
|
||||
sudo apt install ./uur_0.1.1_amd64.deb
|
||||
```
|
||||
|
||||
### Fedora 及兼容 RPM 发行版
|
||||
|
||||
```bash
|
||||
sudo dnf install ./uur-0.1.0-1.x86_64.rpm
|
||||
sudo dnf install ./uur-0.1.1-1.x86_64.rpm
|
||||
```
|
||||
|
||||
如果发行版的 RPM 依赖名称不同,请手动安装依赖或使用通用压缩包。
|
||||
@@ -94,7 +94,7 @@ sudo dnf install ./uur-0.1.0-1.x86_64.rpm
|
||||
### 通用压缩包
|
||||
|
||||
```bash
|
||||
sudo tar --zstd -C / -xf ./uur-0.1.0-linux-x86_64.tar.zst
|
||||
sudo tar --zstd -C / -xf ./uur-0.1.1-linux-x86_64.tar.zst
|
||||
```
|
||||
|
||||
### Nix 与 NixOS
|
||||
|
||||
@@ -12,13 +12,13 @@ needed for system-wide package installation.
|
||||
paru -S uur
|
||||
|
||||
# Downloaded release package
|
||||
sudo pacman -U ./uur-0.1.0-1-x86_64.pkg.tar.zst
|
||||
sudo pacman -U ./uur-0.1.1-1-x86_64.pkg.tar.zst
|
||||
```
|
||||
|
||||
## Debian, Ubuntu, and derivatives
|
||||
|
||||
```bash
|
||||
sudo apt install ./uur_0.1.0_amd64.deb
|
||||
sudo apt install ./uur_0.1.1_amd64.deb
|
||||
```
|
||||
|
||||
The same release artifact covers Debian, Ubuntu, Linux Mint, Pop!_OS, KDE neon,
|
||||
@@ -28,10 +28,10 @@ derivatives.
|
||||
## Fedora, RHEL, and openSUSE families
|
||||
|
||||
```bash
|
||||
sudo dnf install ./uur-0.1.0-1.x86_64.rpm
|
||||
sudo dnf install ./uur-0.1.1-1.x86_64.rpm
|
||||
|
||||
# openSUSE
|
||||
sudo zypper install ./uur-0.1.0-1.x86_64.rpm
|
||||
sudo zypper install ./uur-0.1.1-1.x86_64.rpm
|
||||
```
|
||||
|
||||
This format also covers Fedora derivatives and RPM systems whose repositories
|
||||
@@ -42,7 +42,7 @@ provide the declared Wine, GLib, PipeWire, and portal dependencies.
|
||||
The portable archive targets conventional glibc/FHS systems:
|
||||
|
||||
```bash
|
||||
sudo tar --zstd -C / -xf ./uur-0.1.0-linux-x86_64.tar.zst
|
||||
sudo tar --zstd -C / -xf ./uur-0.1.1-linux-x86_64.tar.zst
|
||||
```
|
||||
|
||||
## Nix and NixOS
|
||||
|
||||
@@ -46,7 +46,7 @@ paru -S uur
|
||||
From a downloaded Arch package:
|
||||
|
||||
```bash
|
||||
sudo pacman -U ./uur-0.1.0-1-x86_64.pkg.tar.zst
|
||||
sudo pacman -U ./uur-0.1.1-1-x86_64.pkg.tar.zst
|
||||
```
|
||||
|
||||
Install the portal backend supplied or recommended by the selected desktop.
|
||||
@@ -60,7 +60,7 @@ Zorin OS, elementary OS, KDE neon, TUXEDO OS, Kali Linux, MX Linux, and other
|
||||
compatible derivatives:
|
||||
|
||||
```bash
|
||||
sudo apt install ./uur_0.1.0_amd64.deb
|
||||
sudo apt install ./uur_0.1.1_amd64.deb
|
||||
```
|
||||
|
||||
The package manager resolves Wine, PipeWire, and the portal frontend. Install
|
||||
@@ -74,10 +74,10 @@ dependency names. Install it with the native frontend:
|
||||
|
||||
```bash
|
||||
# Fedora and compatible systems
|
||||
sudo dnf install ./uur-0.1.0-1.x86_64.rpm
|
||||
sudo dnf install ./uur-0.1.1-1.x86_64.rpm
|
||||
|
||||
# openSUSE family
|
||||
sudo zypper install ./uur-0.1.0-1.x86_64.rpm
|
||||
sudo zypper install ./uur-0.1.1-1.x86_64.rpm
|
||||
```
|
||||
|
||||
RHEL, CentOS Stream, Rocky Linux, AlmaLinux, Oracle Linux, Nobara, Ultramarine,
|
||||
@@ -91,7 +91,7 @@ PCLinuxOS, and similar mutable/FHS systems can use the portable archive when
|
||||
they provide compatible glibc, Wine, PipeWire, and portal libraries:
|
||||
|
||||
```bash
|
||||
sudo tar --zstd -C / -xf ./uur-0.1.0-linux-x86_64.tar.zst
|
||||
sudo tar --zstd -C / -xf ./uur-0.1.1-linux-x86_64.tar.zst
|
||||
```
|
||||
|
||||
Alternatively, build and install for one user:
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "uur";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = lib.cleanSource ../.;
|
||||
cargoLock.lockFile = ../Cargo.lock;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Contributor: uur contributors
|
||||
# Maintainer: uur contributors
|
||||
pkgname=uur
|
||||
pkgver=0.1.0
|
||||
pkgver=0.1.1
|
||||
pkgrel=0
|
||||
pkgdesc="Native Linux companion for NetEase UU Remote"
|
||||
url="https://github.com/panxuc/uur"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
pkgbase = uur
|
||||
pkgdesc = Native Linux companion for NetEase UU Remote (X11/Wayland input and capture bridge)
|
||||
pkgver = 0.1.0
|
||||
pkgver = 0.1.1
|
||||
pkgrel = 1
|
||||
url = https://github.com/panxuc/uur
|
||||
install = uur.install
|
||||
@@ -31,7 +31,7 @@ pkgbase = uur
|
||||
optdepends = libva-utils: VA-API capability diagnostics
|
||||
optdepends = vulkan-tools: Vulkan and Vulkan Video capability diagnostics
|
||||
optdepends = nvidia-utils: NVENC and NVDEC capability diagnostics on NVIDIA GPUs
|
||||
source = uur-0.1.0.tar.gz::https://github.com/panxuc/uur/archive/refs/tags/v0.1.0.tar.gz
|
||||
source = uur-0.1.1.tar.gz::https://github.com/panxuc/uur/archive/refs/tags/v0.1.1.tar.gz
|
||||
sha256sums = SKIP
|
||||
|
||||
pkgname = uur
|
||||
@@ -8,7 +8,7 @@
|
||||
# `uur setup` (it is never redistributed by this package).
|
||||
|
||||
pkgname=uur
|
||||
pkgver=0.1.0
|
||||
pkgver=0.1.1
|
||||
pkgrel=1
|
||||
pkgdesc="Native Linux companion for NetEase UU Remote (X11/Wayland input and capture bridge)"
|
||||
arch=('x86_64')
|
||||
|
||||
@@ -4,6 +4,9 @@ set -euo pipefail
|
||||
project_root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd -P)
|
||||
version=$(sed -n 's/^version = "\([^"]*\)"/\1/p' "$project_root/Cargo.toml" | head -n1)
|
||||
output=${1:-$project_root/dist}
|
||||
mkdir -p "$output"
|
||||
output=$(cd -- "$output" && pwd -P)
|
||||
readonly output
|
||||
build_dir=$(mktemp -d "${TMPDIR:-/tmp}/uur-makepkg.XXXXXX")
|
||||
trap 'rm -rf -- "$build_dir"' EXIT
|
||||
|
||||
@@ -12,7 +15,6 @@ command -v makepkg >/dev/null 2>&1 || {
|
||||
exit 2
|
||||
}
|
||||
|
||||
mkdir -p "$output"
|
||||
sed -e "s|@UUR_VERSION@|$version|g" \
|
||||
-e "s|@UUR_PROJECT_ROOT@|$project_root|g" \
|
||||
"$project_root/packaging/arch/PKGBUILD.in" >"$build_dir/PKGBUILD"
|
||||
|
||||
Reference in new issue
Block a user