Skip to content

Commit c4ffc32

Browse files
EeemsEeems
authored
Stable merge for week 50 of 2025 (#959)
### New Packages - `rmstylusbutton` - 3.0-1 (#939) - `rempack` - 1.1.4 (#940) - `fuseki` - 0.1.0-1 (#949) - `gnugo` - 3.8.0-1 (#949) - `libcpp-utilities` `libcpp-utilities-dev` - 5.31.0-1 (#957) - `libqtforkawesome` `libqtforkawesome-dev` - 0.3.2-1 (#957) - `libqtutilities` `libqtutilities-dev` - 6.18.2-1 (#957) - `syncthingctl` - 2.0.3-1 (#957) ### Updated Packages - `koreader` - 2025.10-1 (#942 #948 #956) - `linux-mainline` - 6.3.0-3 (#904) - `bash-completion` - 2.11-4 (#951) - `calculator` - 0.0.0-17 (#951) - `chessmarkable` - 0.8.1-1 (#951) - `display` - 1:0.0.33-4 (#951) - `doomarkable` - 0.4.1-3 (#951) - `draft` - 0.2.0-26 (#951) - `evtest` - 1.34-4 (#951) - `fbink` - 1.25.0-2 (#951) - `fingerterm` - 1.3.5-16 (#951) - `folly` - 0.0.1-5 (#951) - `fuse` - 1.0.0-6 (#951) - `gocryptfs` - 2.0-beta2-4 (#951) - `keywriter` - 0.2~20-gddc9e73-3 (#951) - `libdlib` `libdlib-dev` - 19.21-3 (#951) - `libvncserver` `libvncclient` `libvncserver-dev` - 0.9.13-3 (#951) - `mmc-utils` - 1.0-2 (#951) - `netevent` - 2.2.2-2 (#951) - `netsurf` - 0.4.0-4 (#951) - `plato` - 0.9.44-1 (#951) - `puzzles` - 0.2.4-5 (#951) - `recrossable` - 0.0.0-9 (#951) - `remarkable-splash` - 1.0-6 (#951) - `remarkable-stylus` - 0.0.3-4 (#951) - `restream` - 1.2.0-2 (#951) - `retris` - 0.6.4-1 (#951) - `rmfakecloud-proxy` - 0.0.3-6 (#951) - `bufshot` - 0.1.2-4 (#951) - `dumbskull` - 0.0.1-5 (#951) - `genie` - 0.1.7-3 (#951) - `harmony` - 0.2.3-3 (#951) - `iago` - 0.1.2-3 (#951) - `lamp` - 0.1.1-4 (#951) - `mines` - 0.1.4-5 (#951) - `nao` - 0.1.2-5 (#951) - `remux` - 0.3.0-7 (#951) - `rpncalc` - 0.0.3-5 (#951) - `simple` - 0.2.1-3 (#951) - `wordlet` - 0.0.2-5 (#951) - `rmservewacominput` - 0.3.0-3 (#951) - `templatectl` - 0.1.3-6 (#951) - `vnsee` - 0.4.1-3 (#951) - `wikipedia` - 0.1.0-5 (#951) - `zshelf` - 0.3.1-5 (#951) ### Tooling - Updated action runners (#941) - Update toltecmk to 0.3.7 (#951) ### Documentation - Remove OpenWrt links from documentation (#944)
1 parent 9d15d2d commit c4ffc32

68 files changed

Lines changed: 826 additions & 351 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/discord-send/action.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ runs:
3030
MSG_COLOR: ${{ inputs.color }}
3131
MSG_VALUE: ${{ inputs.message }}
3232
run: |
33-
payload="$(jq --null-input --compact-output --monochrome-output \
34-
--arg title "$MSG_TITLE" \
35-
--arg link "$MSG_LINK" \
36-
--arg color "$MSG_COLOR" \
37-
--arg message "$MSG_VALUE" \
38-
'{
39-
username: "Toltec",
40-
avatar_url: "https://avatars0.githubusercontent.com/u/71158884",
41-
embeds: [{
42-
title: $title,
43-
url: $link,
44-
color: $color,
45-
description: $message,
46-
}]
47-
}')"
48-
curl --silent --show-error --fail \
49-
--header "Content-Type: application/json" \
50-
--data "$payload" \
51-
'https://discord.com/api/webhooks/${{ inputs.channel }}/${{ inputs.token }}'
33+
payload="$(jq --null-input --compact-output --monochrome-output \
34+
--arg title "$MSG_TITLE" \
35+
--arg link "$MSG_LINK" \
36+
--arg color "$MSG_COLOR" \
37+
--arg message "$MSG_VALUE" \
38+
'{
39+
username: "Toltec",
40+
avatar_url: "https://avatars0.githubusercontent.com/u/71158884",
41+
embeds: [{
42+
title: $title,
43+
url: $link,
44+
color: $color,
45+
description: $message,
46+
}]
47+
}')"
48+
curl --silent --show-error --fail \
49+
--header "Content-Type: application/json" \
50+
--data "$payload" \
51+
'https://discord.com/api/webhooks/${{ inputs.channel }}/${{ inputs.token }}'

‎.github/actions/setup/action.yml‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
11
name: Setup Toltec dependencies
22
runs:
3-
using: "composite"
4-
steps:
5-
- name: Check for Apt updates
6-
shell: bash
7-
run: |
8-
sudo apt-get update -yq
9-
echo "aptVersion=libarchive-tools-$(apt-cache policy libarchive-tools | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV
10-
- name: Cache Apt packages
11-
uses: actions/cache@v4
12-
id: cache-apt
13-
with:
14-
path: ~/.aptcache
15-
key: ${{ env.aptVersion }}
16-
- name: Install or restore Apt packages
17-
shell: bash
18-
env:
19-
CACHE_HIT: ${{ steps.cache-apt.outputs.cache-hit }}
20-
run: |
21-
if [[ "$CACHE_HIT" != 'true' ]]; then
22-
sudo apt-get install -yq libarchive-tools
23-
mkdir -p ~/.aptcache
24-
sudo dpkg -L libarchive-tools | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/.aptcache/
25-
else
26-
sudo cp --verbose --force --recursive ~/.aptcache/* /
27-
fi
28-
- name: Cache shfmt
29-
uses: actions/cache@v4
30-
with:
31-
path: /usr/local/bin/shfmt
32-
key: 43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
33-
- name: Install shfmt
34-
shell: bash
35-
run: |
36-
install_dir=/usr/local/bin
37-
if ! [[ -f "$install_dir"/shfmt ]]; then
38-
shfmt_version=v3.2.1
39-
shfmt_checksum=43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
40-
sudo curl --location --silent --fail --tlsv1.2 --proto '=https' \
41-
--output "$install_dir"/shfmt \
42-
https://github.com/mvdan/sh/releases/download/"$shfmt_version"/shfmt_"$shfmt_version"_linux_amd64
43-
sha256sum -c <(echo "$shfmt_checksum $install_dir/shfmt") > /dev/null 2>&1
44-
sudo chmod a+x "$install_dir"/shfmt
45-
fi
46-
- name: Cache Shellcheck
47-
uses: actions/cache@v4
48-
with:
49-
path: /usr/local/bin/shellcheck
50-
key: 64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8
51-
- name: Install Shellcheck
52-
shell: bash
53-
run: |
54-
install_dir=/usr/local/bin
55-
if ! [[ -f "$install_dir"/shellcheck ]];then
56-
shellcheck_version=v0.7.1
57-
shellcheck_checksum=64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8
58-
shellcheck_arname=shellcheck.tar.xz
59-
curl --location --silent --fail --tlsv1.2 --proto '=https' \
60-
--output "$shellcheck_arname" \
61-
https://github.com/koalaman/shellcheck/releases/download/"$shellcheck_version"/shellcheck-"$shellcheck_version".linux.x86_64.tar.xz
62-
sha256sum -c <(echo "$shellcheck_checksum $shellcheck_arname") > /dev/null 2>&1
63-
tar -xf "$shellcheck_arname" --strip-components=1 \
64-
shellcheck-"$shellcheck_version"/shellcheck
65-
rm "$shellcheck_arname"
66-
chmod a+x shellcheck
67-
sudo chown root:root shellcheck
68-
sudo mv shellcheck "$install_dir"
69-
fi
70-
- name: Setup Python
71-
uses: actions/setup-python@v5
72-
with:
73-
python-version: '3.12'
74-
- name: Cache Python environment
75-
uses: actions/cache@v4
76-
id: cache-python
77-
with:
78-
path: .venv
79-
key: .venv-${{ hashFiles('requirements.txt') }}
80-
- name: Install Python dependencies
81-
shell: bash
82-
env:
83-
CACHE_HIT: ${{ steps.cache-python.outputs.cache-hit }}
84-
run: |
85-
if [[ "$CACHE_HIT" != 'true' ]]; then
86-
make .venv/bin/activate
87-
fi
3+
using: "composite"
4+
steps:
5+
- name: Check for Apt updates
6+
shell: bash
7+
run: |
8+
sudo apt-get update -yq
9+
echo "aptVersion=libarchive-tools-$(apt-cache policy libarchive-tools | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV
10+
- name: Cache Apt packages
11+
uses: actions/cache@v4
12+
id: cache-apt
13+
with:
14+
path: ~/.aptcache
15+
key: ${{ env.aptVersion }}
16+
- name: Install or restore Apt packages
17+
shell: bash
18+
env:
19+
CACHE_HIT: ${{ steps.cache-apt.outputs.cache-hit }}
20+
run: |
21+
if [[ "$CACHE_HIT" != 'true' ]]; then
22+
sudo apt-get install -yq libarchive-tools
23+
mkdir -p ~/.aptcache
24+
sudo dpkg -L libarchive-tools | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/.aptcache/
25+
else
26+
sudo cp --verbose --force --recursive ~/.aptcache/* /
27+
fi
28+
- name: Cache shfmt
29+
uses: actions/cache@v4
30+
with:
31+
path: /usr/local/bin/shfmt
32+
key: 43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
33+
- name: Install shfmt
34+
shell: bash
35+
run: |
36+
install_dir=/usr/local/bin
37+
if ! [[ -f "$install_dir"/shfmt ]]; then
38+
shfmt_version=v3.2.1
39+
shfmt_checksum=43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
40+
sudo curl --location --silent --fail --tlsv1.2 --proto '=https' \
41+
--output "$install_dir"/shfmt \
42+
https://github.com/mvdan/sh/releases/download/"$shfmt_version"/shfmt_"$shfmt_version"_linux_amd64
43+
sha256sum -c <(echo "$shfmt_checksum $install_dir/shfmt") > /dev/null 2>&1
44+
sudo chmod a+x "$install_dir"/shfmt
45+
fi
46+
- name: Cache Shellcheck
47+
uses: actions/cache@v4
48+
with:
49+
path: /usr/local/bin/shellcheck
50+
key: 64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8
51+
- name: Install Shellcheck
52+
shell: bash
53+
run: |
54+
install_dir=/usr/local/bin
55+
if ! [[ -f "$install_dir"/shellcheck ]];then
56+
shellcheck_version=v0.7.1
57+
shellcheck_checksum=64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8
58+
shellcheck_arname=shellcheck.tar.xz
59+
curl --location --silent --fail --tlsv1.2 --proto '=https' \
60+
--output "$shellcheck_arname" \
61+
https://github.com/koalaman/shellcheck/releases/download/"$shellcheck_version"/shellcheck-"$shellcheck_version".linux.x86_64.tar.xz
62+
sha256sum -c <(echo "$shellcheck_checksum $shellcheck_arname") > /dev/null 2>&1
63+
tar -xf "$shellcheck_arname" --strip-components=1 \
64+
shellcheck-"$shellcheck_version"/shellcheck
65+
rm "$shellcheck_arname"
66+
chmod a+x shellcheck
67+
sudo chown root:root shellcheck
68+
sudo mv shellcheck "$install_dir"
69+
fi
70+
- name: Setup Python
71+
uses: actions/setup-python@v5
72+
with:
73+
python-version: "3.12"
74+
- name: Cache Python environment
75+
uses: actions/cache@v4
76+
id: cache-python
77+
with:
78+
path: .venv
79+
key: .venv-${{ hashFiles('requirements.txt') }}
80+
- name: Install Python dependencies
81+
shell: bash
82+
env:
83+
CACHE_HIT: ${{ steps.cache-python.outputs.cache-hit }}
84+
run: |
85+
if [[ "$CACHE_HIT" != 'true' ]]; then
86+
make .venv/bin/activate
87+
fi

‎.github/actions/sync-repository/action.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ runs:
2323
- name: rsync packages and index
2424
shell: bash
2525
run: |
26-
mkdir -p private
27-
chmod 700 private
28-
echo '${{ inputs.ssh-key }}' > private/id_rsa
29-
echo '${{ inputs.ssh-known-hosts }}' > private/known_hosts
30-
chmod 600 private/*
31-
rsync --archive --verbose --compress --delete --hard-links \
32-
-e "ssh -p ${{ inputs.ssh-port }} -i private/id_rsa -o UserKnownHostsFile=private/known_hosts" \
33-
'${{ inputs.local-path }}' \
34-
'${{ inputs.remote-path }}'
35-
rm -r private
26+
mkdir -p private
27+
chmod 700 private
28+
echo '${{ inputs.ssh-key }}' > private/id_rsa
29+
echo '${{ inputs.ssh-known-hosts }}' > private/known_hosts
30+
chmod 600 private/*
31+
rsync --archive --verbose --compress --delete --hard-links \
32+
-e "ssh -p ${{ inputs.ssh-port }} -i private/id_rsa -o UserKnownHostsFile=private/known_hosts" \
33+
'${{ inputs.local-path }}' \
34+
'${{ inputs.remote-path }}'
35+
rm -r private

‎.github/workflows/pr-labels.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
jobs:
66
check-labels:
77
name: Check that PRs against the stable branch are labelled correctly
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-latest
99
steps:
1010
- name: Check labels
1111
run: |
12-
[[ '${{ github.base_ref }}' != stable ]] \
13-
|| [[ '${{ contains(github.event.pull_request.labels.*.name, 'merge') }}' == true ]]
12+
[[ '${{ github.base_ref }}' != stable ]] \
13+
|| [[ '${{ contains(github.event.pull_request.labels.*.name, 'merge') }}' == true ]]

‎.github/workflows/pr.yml‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
11
name: pr
2-
on:
3-
pull_request
2+
on: pull_request
43
jobs:
5-
lint:
6-
name: Check that it conforms to the style guide
7-
runs-on: ubuntu-22.04
8-
steps:
9-
- name: Checkout the Git repository
10-
uses: actions/checkout@v4
11-
- name: Setup Toltec dependencies
12-
uses: ./.github/actions/setup
13-
- name: Check formatting
14-
run: make format
15-
- name: Check for erroneous constructs
16-
run: make lint
17-
pr:
18-
name: Check that it builds without error
19-
runs-on: ubuntu-22.04
20-
needs: lint
21-
steps:
22-
- name: Checkout the Git repository
23-
uses: actions/checkout@v4
24-
- name: Setup Toltec dependencies
25-
uses: ./.github/actions/setup
26-
- name: Build packages
27-
run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new
28-
- name: Save the build output
29-
uses: actions/upload-artifact@v4
30-
with:
31-
name: repo
32-
path: build/repo
33-
- name: Build packages for experimental
34-
if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }}
35-
run: make repo FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}'
36-
- name: Sync packages with the remote repository
37-
if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }}
38-
uses: ./.github/actions/sync-repository
39-
with:
40-
local-path: build/repo/
41-
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
42-
ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
43-
ssh-port: ${{ secrets.SSH_PORT }}
44-
remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/experimental
4+
lint:
5+
name: Check that it conforms to the style guide
6+
runs-on: ubuntu-24.04
7+
steps:
8+
- name: Checkout the Git repository
9+
uses: actions/checkout@v4
10+
- name: Setup Toltec dependencies
11+
uses: ./.github/actions/setup
12+
- name: Check formatting
13+
run: make format
14+
- name: Check for erroneous constructs
15+
run: make lint
16+
pr:
17+
name: Check that it builds without error
18+
runs-on: ubuntu-24.04
19+
needs: lint
20+
steps:
21+
- name: Checkout the Git repository
22+
uses: actions/checkout@v4
23+
- name: Setup Toltec dependencies
24+
uses: ./.github/actions/setup
25+
- name: Build packages
26+
run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new
27+
- name: Save the build output
28+
uses: actions/upload-artifact@v4
29+
with:
30+
name: repo
31+
path: build/repo
32+
- name: Build packages for experimental
33+
if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }}
34+
run: make repo FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}'
35+
- name: Sync packages with the remote repository
36+
if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }}
37+
uses: ./.github/actions/sync-repository
38+
with:
39+
local-path: build/repo/
40+
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
41+
ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
42+
ssh-port: ${{ secrets.SSH_PORT }}
43+
remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/experimental

0 commit comments

Comments
 (0)