aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2023-01-24 11:30:59 +0100
committerEgor Tensin <Egor.Tensin@gmail.com>2023-01-24 11:30:59 +0100
commitdb63b8b5714d5d901064f9aaa52aebfa47cdeb52 (patch)
tree373e4b0143614235908a5791fd87eb9b158cf74a
parentdebian/README: update (diff)
parentworkflows/ci: fix Python 3.6 tests (diff)
downloadlinux-status-db63b8b5714d5d901064f9aaa52aebfa47cdeb52.tar.gz
linux-status-db63b8b5714d5d901064f9aaa52aebfa47cdeb52.zip
Merge branch 'master' into debian
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--README.md2
-rwxr-xr-xtest/test.sh1
3 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b72f37a..71227f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,9 @@ jobs:
strategy:
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
- runs-on: ubuntu-latest
+ # Unpin when this is fixed:
+ # https://github.com/actions/setup-python/issues/544
+ runs-on: ubuntu-20.04
name: 'Python ${{ matrix.python-version }}'
steps:
- name: Checkout
diff --git a/README.md b/README.md
index e4e0464..8fa0051 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Shows your `top`, Docker container status, systemd units & timers, allows you
to reboot the server, etc.
For example, see an instance running on my server at
-https://status.egort.name/.
+https://egort.name/status/.
Installation
------------
diff --git a/test/test.sh b/test/test.sh
index 3b22039..aaf80fd 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -6,6 +6,7 @@
# Distributed under the MIT License.
set -o errexit -o nounset -o pipefail
+shopt -s inherit_errexit lastpipe
script_dir="$( dirname -- "${BASH_SOURCE[0]}" )"
script_dir="$( cd -- "$script_dir" && pwd )"