Skip to content

Commit f676a8e

Browse files
authored
Merge branch 'master' into bf_639_minsize
2 parents 7cbbbfb + a926505 commit f676a8e

File tree

11 files changed

+1480
-31
lines changed

11 files changed

+1480
-31
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
build-on-linux:
4848
strategy:
4949
matrix:
50-
runs-on: [ubuntu-20.04, ubuntu-22.04]
50+
runs-on: [ubuntu-20.04, ubuntu-22.04, ubuntu-latest]
5151
compiler: [g++, clang++]
5252
runs-on: ${{ matrix.runs-on }}
5353
steps:
@@ -72,7 +72,7 @@ jobs:
7272
xvfb-run -a meson test -C build --verbose --no-stdsplit
7373
7474
codecov:
75-
runs-on: ubuntu-22.04
75+
runs-on: ubuntu-latest
7676
permissions:
7777
checks: write
7878
pull-requests: write
@@ -94,14 +94,14 @@ jobs:
9494
xvfb-run -a meson test -C build --verbose --no-stdsplit
9595
- name: lcov
9696
run: |
97-
lcov --directory . --capture --output-file coverage.info; # capture coverage info
97+
lcov --ignore-errors mismatch --directory . --capture --output-file coverage.info; # capture coverage info
9898
lcov --remove coverage.info '/usr/*' --output-file coverage.info; # filter out system
9999
lcov --remove coverage.info '*Test*' --output-file coverage.info; # filter out system
100100
lcov --remove coverage.info '*gtest*' --output-file coverage.info; # filter out system
101101
lcov --list coverage.info; #debug info
102102
# https://docs.codecov.com/docs/quick-start
103103
- name: "Upload coverage reports to Codecov"
104-
uses: codecov/codecov-action@v4
104+
uses: codecov/codecov-action@v5
105105
env:
106106
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
107107
with:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
### Linux
1414

15-
[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-white.svg)](https://snapcraft.io/iptux)
16-
17-
* for Ubuntu 14.04, please check 0.6.x branch: https://github.com/iptux-src/iptux/tree/iptux-0-6
18-
* for Ubuntu 16.04, please check 0.7.x branch: https://github.com/iptux-src/iptux/tree/iptux-0-7
15+
<p align="center">
16+
<a href="https://snapcraft.io/iptux"><img src="https://snapcraft.io/static/images/badges/en/snap-store-white.svg" height="64" alt="Get it from the Snap Store"></a>
17+
<a href="https://flathub.org/apps/io.github.iptux_src.iptux"><img src="https://flathub.org/api/badge?svg&locale=en&light" height="64" alt="Get it on Flathub"></a>
18+
</p>
1919

2020
### Mac OS X
2121

po/LINGUAS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cs de en_GB es fr gl it lb nb_NO pl pt pt_BR ru uk zh_CN zh_TW
1+
cs de en_GB es fr gl it lb nb_NO pl pt pt_BR ru ta uk zh_CN zh_TW

0 commit comments

Comments
 (0)