diff options
| author | Vasek Sraier <git@vakabus.cz> | 2022-08-02 12:48:48 +0200 |
|---|---|---|
| committer | Vasek Sraier <git@vakabus.cz> | 2022-08-02 12:48:48 +0200 |
| commit | 794acf074bae8004b9bc5a519d173882632ae2cd (patch) | |
| tree | 366cbcf2298e2e4302ec0d2bb770b1a5f541a9ba /ci | |
| parent | Merge branch 'manager-integration-without-submodule' into 'manager' (diff) | |
| parent | Merge !1325: ci/pkgtest: remove Ubuntu 21.10 (diff) | |
| download | knot-resolver-794acf074bae8004b9bc5a519d173882632ae2cd.tar.xz knot-resolver-794acf074bae8004b9bc5a519d173882632ae2cd.zip | |
Merge branch 'master' into manager
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/images/debian-11/Dockerfile | 2 | ||||
| -rw-r--r-- | ci/images/lxc-debian-11/Dockerfile | 2 | ||||
| -rw-r--r-- | ci/pkgtest.yaml | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/ci/images/debian-11/Dockerfile b/ci/images/debian-11/Dockerfile index b755720a..be22a2ad 100644 --- a/ci/images/debian-11/Dockerfile +++ b/ci/images/debian-11/Dockerfile @@ -37,7 +37,7 @@ RUN pip3 install pylint RUN pip3 install pep8 RUN pip3 install pytest-xdist # FIXME replace with dnspython >= 2.2.0 once released -RUN pip3 install git+git://github.com/bwelling/dnspython.git@72348d4698a8f8b209fbdf9e72738904ad31b930 +RUN pip3 install git+https://github.com/bwelling/dnspython.git@72348d4698a8f8b209fbdf9e72738904ad31b930 # tests/pytest dependencies: skip over broken versions RUN pip3 install jinja2 'pytest != 6.0.0' pytest-html pytest-xdist # apkg for packaging diff --git a/ci/images/lxc-debian-11/Dockerfile b/ci/images/lxc-debian-11/Dockerfile index 32c6bfe6..663c6094 100644 --- a/ci/images/lxc-debian-11/Dockerfile +++ b/ci/images/lxc-debian-11/Dockerfile @@ -34,7 +34,7 @@ RUN pip3 install pylint RUN pip3 install pep8 RUN pip3 install pytest-xdist # FIXME replace with dnspython >= 2.2.0 once released -RUN pip3 install git+git://github.com/bwelling/dnspython.git@72348d4698a8f8b209fbdf9e72738904ad31b930 +RUN pip3 install git+https://github.com/bwelling/dnspython.git@72348d4698a8f8b209fbdf9e72738904ad31b930 # tests/pytest dependencies: skip over broken versions RUN pip3 install jinja2 'pytest != 6.0.0' pytest-html pytest-xdist # apkg for packaging diff --git a/ci/pkgtest.yaml b/ci/pkgtest.yaml index f0547e61..070a9781 100644 --- a/ci/pkgtest.yaml +++ b/ci/pkgtest.yaml @@ -122,12 +122,14 @@ ubuntu-22.04:pkgbuild: nixos-unstable:pkgbuild: <<: *pkgbuild # We do NOT use LXC, for now at least. + parallel: + matrix: + - PLATFORM: [ amd64, arm64 ] tags: - docker - linux - - amd64 - # TODO: untag after resolving problems around https://github.com/NixOS/nix/issues/5776 - image: nixos/nix:2.3.12 + - ${PLATFORM} + image: nixos/nix variables: #NIX_PATH: nixpkgs=https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz |