Stable merge for week 29 of 2021

.github/actions/setup/action.yml

@@ -6,7 +6,7 @@ runs:
           shell: bash
           run: |
             sudo apt-get update -yq
-            sudo apt-get install -yq libarchive-tools python3-docutils
+            sudo apt-get install -yq libarchive-tools
         - name: Install shfmt and Shellcheck
           shell: bash
           run: |

.github/workflows/stable.yml

@@ -26,15 +26,15 @@ jobs:
                 ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
                 ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
                 remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/stable
-            - name: Build website
-              run: make web
-            - name: Sync website with the remote repository
-              uses: ./.github/actions/sync-repository
-              with:
-                local-path: build/web/
-                ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-                ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
-                remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/web
+            - name: Trigger website rebuild
+              run: gh api repos/toltec-dev/web/dispatches -f event_type='update-bootstrap-from-stable'
+              env:
+                GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+            - name: Create Github Release
+              continue-on-error: true
+              run: hub release create -t ${{ github.sha }} -m "${{ github.event.commits[0].message }}" $(date +%G-W%V-%u)
+              env:
+                GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
             - name: Send notification to Discord
               continue-on-error: true
               uses: ./.github/actions/discord-send
@@ -44,4 +44,4 @@ jobs:
                 title: New Toltec stable update available
                 link: https://toltec-dev.org/stable
                 color: 0x2ea043
-                message: ${{ github.event.head_commit.message }}
+                message: ${{ github.event.commits[0].message }}

.github/workflows/testing.yml

@@ -35,4 +35,4 @@ jobs:
                 title: New Toltec testing update available
                 link: https://toltec-dev.org/testing
                 color: 0xe3b341
-                message: ${{ github.event.head_commit.message }}
+                message: ${{ github.event.commits[0].message }}

.mypy.ini

@@ -1,3 +1,5 @@
 [mypy]
+[mypy-elftools.*]
+ignore_missing_imports = True
 [mypy-docker.*]
 ignore_missing_imports = True

Makefile

@@ -24,11 +24,6 @@ Building packages:
                     on the reMarkable, which can be installed with
                     `opkg install rsync`.
 
-
-Building webpages:
-
-    web             Generate the Toltec website.
-
 Checking for errors:
 
     repo-check      Compare the local repository to the remote one.
@@ -49,9 +44,6 @@ export USAGE
 help:
 	@echo "$$USAGE"
 
-web:
-	./scripts/web-build web build/web
-
 repo:
 	./scripts/repo_build.py $(FLAGS)
 
@@ -82,7 +74,7 @@ $(RECIPES_PUSH): %:
 	if ! rsync --rsync-path /opt/bin/rsync \
 	      --archive --verbose --compress --ignore-times \
 	      $$(for pkg in $${pkgnames[@]}; do \
-	             echo build/repo/"$$pkg"_*.ipk; \
+	             echo build/repo/*/"$$pkg"_*.ipk; \
 	         done) \
 	      root@"$(HOST)":~/.cache/toltec/; then \
 		echo "rysnc exited with an error." \
@@ -103,7 +95,7 @@ format-fix:
 
 lint:
 	@echo "==> Linting Bash scripts"
-	shellcheck $$(shfmt -f .)
+	shellcheck $$(shfmt -f .) -P SCRIPTDIR
 	@echo "==> Typechecking Python files"
 	MYPYPATH=scripts mypy --disallow-untyped-defs scripts
 	@echo "==> Linting Python files"
@@ -119,7 +111,6 @@ clean:
 
 .PHONY: \
     help \
-    web \
     repo \
     repo-local \
     repo-check \

README.md

@@ -2,9 +2,9 @@
 
 ![Status of the stable repository](https://github.com/toltec-dev/toltec/workflows/stable/badge.svg)
 ![Status of the testing repository](https://github.com/toltec-dev/toltec/workflows/testing/badge.svg)
-[![rm1](https://img.shields.io/badge/rM1-supported-green)](https://remarkable.com/store/remarkable)
-[![rm2](https://img.shields.io/badge/rM2-experimental-yellow)](https://remarkable.com/store/remarkable-2)
-[![Discord](https://img.shields.io/discord/463752820026376202.svg?label=reMarkable&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/ATqQGfu)
+[![rM1: supported](https://img.shields.io/badge/rM1-supported-green)](https://remarkable.com/store/remarkable)
+[![rM2: supported](https://img.shields.io/badge/rM2-supported-green)](https://remarkable.com/store/remarkable-2)
+[![Discord](https://img.shields.io/discord/385916768696139794.svg?label=reMarkable&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/ATqQGfu)
 
 Toltec is a community-maintained repository of free software for [the reMarkable tablet](https://remarkable.com/).
 
@@ -15,7 +15,7 @@ To automatically install Opkg, Entware and Toltec, run the bootstrap script in a
 
 ```sh
 $ wget http://toltec-dev.org/bootstrap
-$ echo "5f826348764f664e577700c4d9d97e36f250ac27b616f7c09ba4a80e604a3012  bootstrap" | sha256sum -c && bash bootstrap
+$ echo "9195122984700c76ccdc58e25d09d0fca486324e8fc55ba781f6e1b812cc186c  bootstrap" | sha256sum -c && bash bootstrap
 ```
 
 > **Warning:**

docs/branches.md

@@ -5,7 +5,9 @@ As a user, **you always want to use the stable branch**, which is the default on
 The testing branch exists solely for the repository maintainers to make sure that packages work correctly before distributing them to users.
 It may contain packages that could cause breakage if you install them on your device.
 
-> To use the testing branch, update the `/opt/etc/opkg.conf` file on an existing install or set the `toltec_branch` variable to `testing` when installing through the bootstrap script.
+Use the `toltecctl switch-branch [stable|testing]` command to switch between the stable and testing branches.
+After switching from stable to testing, you should run `opkg upgrade` to upgrade your installed packages to their version in testing.
+After switching from testing to stable, you may need to manually downgrade the packages that were newer in testing.
 
 ### Adding or Updating a Package