diff options
| author | Theo Buehler <tb@openbsd.org> | 2026-07-30 08:29:03 +0200 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2026-07-30 08:29:03 +0200 |
| commit | 0ab79b7c8111fce123821c752655c7e6e55110f8 (patch) | |
| tree | d8ae992fefc2436ec01dc74d5fb88b2ad41a4617 /.github | |
| parent | 7a164a4d0a17de54482e8e376a72b2b3a5d071b9 (diff) | |
| parent | a63377faa2aabf5ab9b8e14ba9202950f5a00e62 (diff) | |
| download | portable-0ab79b7c8111fce123821c752655c7e6e55110f8.tar.gz portable-0ab79b7c8111fce123821c752655c7e6e55110f8.tar.bz2 portable-0ab79b7c8111fce123821c752655c7e6e55110f8.zip | |
Land #1341 - wire up libssl verify test
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/emscripten.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/fedora-rawhide.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/freebsd.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/linux.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/solaris.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 9 |
7 files changed, 46 insertions, 5 deletions
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 2addcec..bd4c9a7 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml | |||
| @@ -22,6 +22,12 @@ jobs: | |||
| 22 | - name: "Checkout repository" | 22 | - name: "Checkout repository" |
| 23 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | 23 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 |
| 24 | 24 | ||
| 25 | - name: "Install test dependencies" | ||
| 26 | run: | | ||
| 27 | sudo apt-get update | ||
| 28 | sudo apt-get install -y libio-socket-ssl-perl | ||
| 29 | perl -MIO::Socket::SSL::Utils -e 1 | ||
| 30 | |||
| 25 | - name: "Setup emsdk" | 31 | - name: "Setup emsdk" |
| 26 | uses: mymindstorm/setup-emsdk@4528d102f7230f0e7b276855c01ea1159be0e984 # v16 | 32 | uses: mymindstorm/setup-emsdk@4528d102f7230f0e7b276855c01ea1159be0e984 # v16 |
| 27 | with: | 33 | with: |
| @@ -50,6 +56,12 @@ jobs: | |||
| 50 | - name: "Checkout repository" | 56 | - name: "Checkout repository" |
| 51 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | 57 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 |
| 52 | 58 | ||
| 59 | - name: "Install test dependencies" | ||
| 60 | run: | | ||
| 61 | sudo apt-get update | ||
| 62 | sudo apt-get install -y libio-socket-ssl-perl | ||
| 63 | perl -MIO::Socket::SSL::Utils -e 1 | ||
| 64 | |||
| 53 | - name: "Setup emsdk" | 65 | - name: "Setup emsdk" |
| 54 | uses: mymindstorm/setup-emsdk@4528d102f7230f0e7b276855c01ea1159be0e984 # v16 | 66 | uses: mymindstorm/setup-emsdk@4528d102f7230f0e7b276855c01ea1159be0e984 # v16 |
| 55 | with: | 67 | with: |
diff --git a/.github/workflows/fedora-rawhide.yml b/.github/workflows/fedora-rawhide.yml index 1283c4a..078bc02 100644 --- a/.github/workflows/fedora-rawhide.yml +++ b/.github/workflows/fedora-rawhide.yml | |||
| @@ -26,7 +26,8 @@ jobs: | |||
| 26 | - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | 26 | - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 |
| 27 | - name: Install dependencies | 27 | - name: Install dependencies |
| 28 | run: | | 28 | run: | |
| 29 | dnf -y install git make clang cmake ninja-build autoconf automake libtool diffutils patch gawk | 29 | dnf -y install git make clang cmake ninja-build autoconf automake libtool diffutils patch gawk perl-IO-Socket-SSL |
| 30 | perl -MIO::Socket::SSL::Utils -e 1 | ||
| 30 | - name: Pull upstream source | 31 | - name: Pull upstream source |
| 31 | run: | | 32 | run: | |
| 32 | ./update.sh | 33 | ./update.sh |
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 64de243..4e38efd 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml | |||
| @@ -36,8 +36,9 @@ jobs: | |||
| 36 | release: "${{ env.FREEBSD_VERSION }}" | 36 | release: "${{ env.FREEBSD_VERSION }}" |
| 37 | copyback: false | 37 | copyback: false |
| 38 | prepare: | | 38 | prepare: | |
| 39 | pkg install -y autoconf automake libtool | 39 | pkg install -y autoconf automake libtool p5-IO-Socket-SSL |
| 40 | run: | | 40 | run: | |
| 41 | perl -MIO::Socket::SSL::Utils -e 1 | ||
| 41 | ./configure | 42 | ./configure |
| 42 | make -j2 check || (cat tests/test-suite.log && exit 1) | 43 | make -j2 check || (cat tests/test-suite.log && exit 1) |
| 43 | 44 | ||
| @@ -63,8 +64,9 @@ jobs: | |||
| 63 | release: "${{ env.FREEBSD_VERSION }}" | 64 | release: "${{ env.FREEBSD_VERSION }}" |
| 64 | copyback: false | 65 | copyback: false |
| 65 | prepare: | | 66 | prepare: | |
| 66 | pkg install -y cmake ninja perl5 | 67 | pkg install -y cmake ninja p5-IO-Socket-SSL |
| 67 | run: | | 68 | run: | |
| 69 | perl -MIO::Socket::SSL::Utils -e 1 | ||
| 68 | export CTEST_OUTPUT_ON_FAILURE=1 | 70 | export CTEST_OUTPUT_ON_FAILURE=1 |
| 69 | cmake -G Ninja -B build | 71 | cmake -G Ninja -B build |
| 70 | ninja -C build | 72 | ninja -C build |
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a44df9d..197e894 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml | |||
| @@ -46,6 +46,12 @@ jobs: | |||
| 46 | - name: "Checkout repository" | 46 | - name: "Checkout repository" |
| 47 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | 47 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 |
| 48 | 48 | ||
| 49 | - name: "Install test dependencies" | ||
| 50 | run: | | ||
| 51 | sudo apt-get update | ||
| 52 | sudo apt-get install -y libio-socket-ssl-perl | ||
| 53 | perl -MIO::Socket::SSL::Utils -e 1 | ||
| 54 | |||
| 49 | - name: "Run tests" | 55 | - name: "Run tests" |
| 50 | run: ./scripts/test || (status=$?; cat tests/test-suite.log; exit $status) | 56 | run: ./scripts/test || (status=$?; cat tests/test-suite.log; exit $status) |
| 51 | env: | 57 | env: |
| @@ -68,6 +74,12 @@ jobs: | |||
| 68 | - name: "Checkout repository" | 74 | - name: "Checkout repository" |
| 69 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | 75 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 |
| 70 | 76 | ||
| 77 | - name: "Install test dependencies" | ||
| 78 | run: | | ||
| 79 | sudo apt-get update | ||
| 80 | sudo apt-get install -y libio-socket-ssl-perl | ||
| 81 | perl -MIO::Socket::SSL::Utils -e 1 | ||
| 82 | |||
| 71 | - name: "Run tests" | 83 | - name: "Run tests" |
| 72 | run: ./scripts/test | 84 | run: ./scripts/test |
| 73 | env: | 85 | env: |
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9b9d5e4..c619b17 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml | |||
| @@ -25,7 +25,12 @@ jobs: | |||
| 25 | arch: ["arm64", "x86_64"] | 25 | arch: ["arm64", "x86_64"] |
| 26 | steps: | 26 | steps: |
| 27 | - name: "Install required packages" | 27 | - name: "Install required packages" |
| 28 | run: brew install automake libtool | 28 | run: | |
| 29 | brew install automake libtool perl cpanminus | ||
| 30 | PERL="$(brew --prefix perl)/bin/perl" | ||
| 31 | "$PERL" "$(command -v cpanm)" --notest IO::Socket::SSL | ||
| 32 | echo "$(brew --prefix perl)/bin" >> "$GITHUB_PATH" | ||
| 33 | "$PERL" -MIO::Socket::SSL::Utils -e 1 | ||
| 29 | 34 | ||
| 30 | - name: "Checkout repository" | 35 | - name: "Checkout repository" |
| 31 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | 36 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 |
diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml index 24c4056..0e50f5f 100644 --- a/.github/workflows/solaris.yml +++ b/.github/workflows/solaris.yml | |||
| @@ -32,6 +32,8 @@ jobs: | |||
| 32 | with: | 32 | with: |
| 33 | prepare: | | 33 | prepare: | |
| 34 | pkg install gcc make | 34 | pkg install gcc make |
| 35 | PERL_MM_USE_DEFAULT=1 cpan -T IO::Socket::SSL | ||
| 35 | run: | | 36 | run: | |
| 37 | perl -MIO::Socket::SSL::Utils -e 1 | ||
| 36 | MAKE=gmake ./configure | 38 | MAKE=gmake ./configure |
| 37 | gmake -j2 check || (cat tests/test-suite.log && exit 1) | 39 | gmake -j2 check || (cat tests/test-suite.log && exit 1) |
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0cd342e..4814ffa 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml | |||
| @@ -29,6 +29,7 @@ jobs: | |||
| 29 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | 29 | uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 |
| 30 | 30 | ||
| 31 | - name: "Setup MSYS2" | 31 | - name: "Setup MSYS2" |
| 32 | id: msys2 | ||
| 32 | uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.32.0 | 33 | uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.32.0 |
| 33 | with: | 34 | with: |
| 34 | update: true | 35 | update: true |
| @@ -38,6 +39,7 @@ jobs: | |||
| 38 | git | 39 | git |
| 39 | patch | 40 | patch |
| 40 | perl | 41 | perl |
| 42 | perl-IO-Socket-SSL | ||
| 41 | 43 | ||
| 42 | - name: "Update" | 44 | - name: "Update" |
| 43 | shell: msys2 {0} | 45 | shell: msys2 {0} |
| @@ -46,6 +48,11 @@ jobs: | |||
| 46 | - name: "Configure CMake" | 48 | - name: "Configure CMake" |
| 47 | shell: pwsh | 49 | shell: pwsh |
| 48 | run: | | 50 | run: | |
| 51 | $perl = Join-Path '${{ steps.msys2.outputs.msys2-location }}' 'usr\bin\perl.exe' | ||
| 52 | & $perl -MIO::Socket::SSL::Utils -e 1 | ||
| 53 | if ($LASTEXITCODE -ne 0) { | ||
| 54 | throw "IO::Socket::SSL::Utils is unavailable" | ||
| 55 | } | ||
| 49 | $generator = cmake --help | | 56 | $generator = cmake --help | |
| 50 | Select-String '^\s*\*?\s*(Visual Studio \d+ \d+)' | | 57 | Select-String '^\s*\*?\s*(Visual Studio \d+ \d+)' | |
| 51 | Select-Object -First 1 | | 58 | Select-Object -First 1 | |
| @@ -54,7 +61,7 @@ jobs: | |||
| 54 | throw "No Visual Studio CMake generator found" | 61 | throw "No Visual Studio CMake generator found" |
| 55 | } | 62 | } |
| 56 | Write-Host "Using generator: $generator" | 63 | Write-Host "Using generator: $generator" |
| 57 | cmake -Bbuild -G "$generator" -A ${{ matrix.arch }} -D BUILD_SHARED_LIBS=${{ matrix.shared }} -D CMAKE_INSTALL_PREFIX=../local | 64 | cmake -Bbuild -G "$generator" -A ${{ matrix.arch }} -D BUILD_SHARED_LIBS=${{ matrix.shared }} -D CMAKE_INSTALL_PREFIX=../local "-DPERL_EXECUTABLE=$perl" |
| 58 | 65 | ||
| 59 | - name: "Build" | 66 | - name: "Build" |
| 60 | shell: cmd | 67 | shell: cmd |
