Skip to content

Commit 65dd2a8

Browse files
authored
Merge branch 'main' into main
2 parents 7e38ea1 + 5166de0 commit 65dd2a8

35 files changed

+691
-95
lines changed

.clang-format

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
UseTab: Always
2+
IndentWidth: 4
3+
TabWidth: 4
4+
ColumnLimit: 80
5+
AllowShortFunctionsOnASingleLine: None

.github/FUNDING.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# These are supported funding model platforms
2+
3+
github: [erikreider] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
12+
polar: # Replace with a single Polar username
13+
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
14+
thanks_dev: # Replace with a single thanks.dev username
15+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ jobs:
1717
PKGBUILD-build:
1818
container: archlinux:base-devel
1919
runs-on: ubuntu-latest
20-
strategy:
21-
matrix:
22-
version: [PKGBUILD, PKGBUILD-git]
2320
steps:
2421
- name: Install packages
2522
run: |
@@ -38,13 +35,12 @@ jobs:
3835
- name: Check out sources
3936
uses: actions/checkout@v3
4037

41-
- name: Test ${{ matrix.version }}
38+
- name: Test PKGBUILD
4239
run: |
43-
file="${{ matrix.version }}"
44-
build_dir="/tmp/$file/"
40+
build_dir="/tmp/PKGBUILD-git/"
4541
cd build-scripts
4642
mkdir $build_dir
47-
cp ./$file $build_dir/PKGBUILD
43+
cp ./PKGBUILD-git $build_dir/PKGBUILD
4844
cd $build_dir
4945
sudo chown builduser $build_dir
5046
sudo -H -u builduser bash -c 'makepkg -s --noconfirm'

.github/workflows/fedora-build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ on:
1111

1212
jobs:
1313
fedora-build:
14-
container: fedora:latest
14+
container: registry.fedoraproject.org/fedora-minimal:latest
1515
runs-on: ubuntu-latest
1616

1717
steps:
1818
- name: Install tooling for source RPM build
1919
run: |
20-
dnf -y install @development-tools @rpm-development-tools
21-
dnf -y install rpkg git
22-
dnf -y install 'dnf-command(builddep)'
20+
microdnf -y install --nodocs --setopt=install_weak_deps=0 \
21+
@development-tools @rpm-development-tools rpkg git 'dnf5-command(builddep)'
2322
2423
# It is necessary to checkout into sub-directory, because of some weird ownership problems cause by using containers
2524
- name: Check out sources
@@ -42,7 +41,7 @@ jobs:
4241
- name: Install build dependencies
4342
run: |
4443
cd swaync
45-
dnf -y builddep ./specs/swaync.rpkg.spec
44+
microdnf -y builddep ./specs/swaync.rpkg.spec
4645
4746
- name: Local build
4847
run: |

.github/workflows/fedora-copr.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
fedora-copr:
12-
container: fedora:latest
12+
container: registry.fedoraproject.org/fedora-minimal:latest
1313
runs-on: ubuntu-latest
1414

1515
steps:
@@ -29,7 +29,8 @@ jobs:
2929
3030
- name: Install tooling for source RPM build
3131
run: |
32-
dnf -y install copr-cli rpkg git
32+
microdnf -y install --nodocs --setopt=install_weak_deps=0 \
33+
copr-cli rpkg git
3334
3435
# It is necessary to checkout into sub-directory, because of some weird ownership problems cause by using containers
3536
- name: Check out sources

.github/workflows/linting.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ jobs:
2525
fail: true
2626

2727
rpmlint:
28-
container: fedora:latest
28+
container: registry.fedoraproject.org/fedora-minimal:latest
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Install rpmlint
32-
run: dnf -y install rpmlint rpkg
32+
run: |
33+
microdnf -y install --nodocs --setopt=install_weak_deps=0 \
34+
rpmlint rpkg
3335
3436
- name: Check out sources
3537
uses: actions/checkout@v3

.github/workflows/ubuntu-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515

1616
jobs:
1717
ubuntu-build:
18-
container: ubuntu:23.10
18+
container: ubuntu:24.10
1919
runs-on: ubuntu-latest
2020
env:
2121
DEBIAN_FRONTEND: noninteractive

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ SwayNotificationCenter
77
./swaync*
88
./src/swaync
99
./src/swaync*
10-
swaync-git*
10+
.cache/

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SwayNotificationCenter
22
======================
33

4-
[![Check PKGBUILD builds for Arch.](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/PKGBUILD-builds.yml/badge.svg)](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/PKGBUILD-builds.yml)
4+
[![Check PKGBUILD builds for Arch.](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/PKGBUILD-buildd.yml/badge.svg)](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/PKGBUILD-buildd.yml)
55
[![Check build for Fedora.](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/fedora-build.yml/badge.svg)](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/fedora-build.yml)
66
[![Check build for latest Ubuntu LTS.](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/ubuntu-build.yml/badge.svg)](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/ubuntu-build.yml)
77
[![Linting](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/linting.yml/badge.svg)](https://github.com/ErikReider/SwayNotificationCenter/actions/workflows/linting.yml)
@@ -116,7 +116,9 @@ The package is available on COPR:
116116

117117
```zsh
118118
dnf copr enable erikreider/SwayNotificationCenter
119+
# Or latest stable release or -git package
119120
dnf install SwayNotificationCenter
121+
dnf install SwayNotificationCenter-git
120122
```
121123

122124
### Fedora Silverblue (and other rpm-ostree variants)

build-scripts/PKGBUILD

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

0 commit comments

Comments
 (0)