From 171810e42712c7cfcd7bcfb5fe6c35f2a935e4c6 Mon Sep 17 00:00:00 2001 From: Kirill Isakov Date: Mon, 16 Aug 2021 19:24:13 +0600 Subject: [PATCH] CI: run tests with libgcrypt. --- .ci/deps.sh | 6 +++--- .ci/test/run.sh | 3 +++ .github/workflows/test.yml | 20 +++++++++++++++++--- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.ci/deps.sh b/.ci/deps.sh index 4906384b..8302d71f 100755 --- a/.ci/deps.sh +++ b/.ci/deps.sh @@ -7,7 +7,7 @@ deps_linux_alpine() { apk add \ git binutils make autoconf automake gcc linux-headers diffutils texinfo \ - procps socat shadow sudo \ + procps socat shadow sudo libgcrypt-dev \ openssl-dev zlib-dev lzo-dev ncurses-dev readline-dev musl-dev lz4-dev vde2-dev } @@ -55,7 +55,7 @@ deps_linux_rhel() { yum install -y \ git binutils make autoconf automake gcc diffutils sudo texinfo netcat procps systemd \ - findutils socat lzo-devel zlib-devel lz4-devel ncurses-devel readline-devel "$@" + findutils socat lzo-devel zlib-devel lz4-devel ncurses-devel readline-devel libgcrypt-devel "$@" if yum info openssl11-devel; then yum install -y openssl11-devel @@ -89,7 +89,7 @@ deps_linux() { } deps_macos() { - brew install coreutils netcat automake lzo lz4 miniupnpc "$@" + brew install coreutils netcat automake lzo lz4 miniupnpc libgcrypt "$@" pip3 install --user compiledb } diff --git a/.ci/test/run.sh b/.ci/test/run.sh index a6a38b78..3e177882 100644 --- a/.ci/test/run.sh +++ b/.ci/test/run.sh @@ -75,6 +75,9 @@ default) nolegacy) run_tests nolegacy --disable-legacy-protocol ;; +gcrypt) + run_tests gcrypt --with-libgcrypt + ;; *) bail "unknown test flavor $1" ;; diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db678104..39c7dc75 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ on: jobs: cross: runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 30 strategy: fail-fast: false matrix: @@ -40,6 +40,9 @@ jobs: - name: Run tests without legacy protocol run: sudo -u build CI=1 HOST=${{ matrix.arch }} sh .ci/test/run.sh nolegacy + - name: Run tests with libgcrypt + run: sudo -u build CI=1 HOST=${{ matrix.arch }} sh .ci/test/run.sh gcrypt + - name: Upload test results uses: actions/upload-artifact@v2 with: @@ -188,6 +191,9 @@ jobs: - name: Run tests without legacy protocol run: sudo -u build CI=1 sh .ci/test/run.sh nolegacy + - name: Run tests with libgcrypt + run: sudo -u build CI=1 sh .ci/test/run.sh gcrypt + - name: Upload test results uses: actions/upload-artifact@v2 with: @@ -244,7 +250,7 @@ jobs: macos: runs-on: macos-latest - timeout-minutes: 15 + timeout-minutes: 20 steps: - name: Checkout code @@ -264,6 +270,9 @@ jobs: - name: Run tests without legacy protocol run: sh .ci/test/run.sh nolegacy + - name: Run tests with libgcrypt + run: sh .ci/test/run.sh gcrypt + - name: Upload test results uses: actions/upload-artifact@v2 with: @@ -273,7 +282,7 @@ jobs: windows: runs-on: windows-latest - timeout-minutes: 20 + timeout-minutes: 30 steps: - name: Install msys2 @@ -285,6 +294,7 @@ jobs: base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-openssl + mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-zlib mingw-w64-x86_64-lzo2 mingw-w64-x86_64-lz4 @@ -317,6 +327,10 @@ jobs: shell: msys2 {0} run: sh .ci/test/run.sh nolegacy + - name: Run tests with libgcrypt + shell: msys2 {0} + run: sh .ci/test/run.sh gcrypt + - name: Upload test results uses: actions/upload-artifact@v2 with: -- 2.20.1