From 45dbf05891b99f5945616df05485f6fcfda971bd Mon Sep 17 00:00:00 2001
From: Egor Tensin <egor@tensin.name>
Date: Tue, 16 Dec 2025 00:00:20 +0100
Subject: modernize Compose usage

---
 Makefile                       | 6 +++---
 test/docker/docker-compose.yml | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d713dd2..5c92bec 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,9 @@ test/linux-home:
 
 test/docker/%: DO
 	cd test/docker && \
-		DISTRO='$*' docker-compose build --force-rm --progress plain --pull -q && \
-		docker-compose run --rm test && \
-		docker-compose down -v
+		DISTRO='$*' docker compose --progress plain build --force-rm --pull -q && \
+		docker compose run --rm test && \
+		docker compose down -v
 
 # Xenial has bash 4.3, which doesn't support inherit_errexit, which is a good
 # thing to test against.
diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml
index 0689ad3..05f1f6a 100644
--- a/test/docker/docker-compose.yml
+++ b/test/docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   test:
     build:
-- 
cgit v1.3


From 6b58e113ebe957e0d3c5cf65d9e33aae9c548f01 Mon Sep 17 00:00:00 2001
From: Egor Tensin <egor@tensin.name>
Date: Tue, 16 Dec 2025 00:01:22 +0100
Subject: Makefile: fix a typo

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5c92bec..24be841 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ test/all: test/local test/docker
 test/local:
 	./test/local/test.sh
 
-# This is deliberately excluded from test/all, because it quite destructive.
+# This is deliberately excluded from test/all, because it's quite destructive.
 .PHONY: test/linux-home
 test/linux-home:
 	./test/linux-home/test.sh
-- 
cgit v1.3


From 338406954d773e3c7a35422524bdf4d3ae40f663 Mon Sep 17 00:00:00 2001
From: Egor Tensin <egor@tensin.name>
Date: Tue, 16 Dec 2025 14:57:02 +0100
Subject: workflows/ci: upgrade actions

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f9d3da0..8aba1a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     name: 'Test / ${{ matrix.os }}'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install dependencies
         run: |
@@ -37,7 +37,7 @@ jobs:
     name: 'Test / Docker / ${{ matrix.distro }}'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Test
         run: make 'test/docker/${{ matrix.distro }}'
-- 
cgit v1.3