diff options
| author | Egor Tensin <egor@tensin.name> | 2025-12-16 15:00:33 +0100 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2025-12-16 15:00:33 +0100 |
| commit | a3d84d31379f9fa1c005d5aa2103b533fe2c7769 (patch) | |
| tree | 2557850d45a90cff63e81c0acb99793831d198d6 | |
| parent | debian: update GPG key (diff) | |
| parent | workflows/ci: upgrade actions (diff) | |
| download | config-links-a3d84d31379f9fa1c005d5aa2103b533fe2c7769.tar.gz config-links-a3d84d31379f9fa1c005d5aa2103b533fe2c7769.zip | |
Merge branch 'master' into debian
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | test/docker/docker-compose.yml | 1 |
3 files changed, 6 insertions, 7 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 }}' @@ -16,16 +16,16 @@ 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 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: |