Skip to content

Commit 0b8bec8

Browse files
Update and re-enable hitch CI/CD test.
Requires wolfSSL/osp#325. Fixes wolfSSL/osp#218.
1 parent 02f04d7 commit 0b8bec8

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
matrix:
4545
# List of releases to test
4646
include:
47-
- ref: 1.7.3
47+
- ref: 1.8.0
4848
ignore-tests: >-
49-
test13-r82.sh test15-proxy-v2-npn.sh test39-client-cert-proxy.sh
49+
test12-cfg.sh test13-r82.sh test15-proxy-v2-npn.sh test39-client-cert-proxy.sh test41-client-cert-pb.sh
5050
name: ${{ matrix.ref }}
5151
if: github.repository_owner == 'wolfssl'
5252
runs-on: ubuntu-latest
@@ -72,13 +72,13 @@ jobs:
7272
run: |
7373
export DEBIAN_FRONTEND=noninteractive
7474
sudo apt-get update
75-
sudo apt-get install -y libev-dev libssl-dev automake python3-docutils flex bison pkg-config make
75+
sudo apt-get install -y libev-dev automake python3-docutils flex bison pkg-config make
7676
7777
- name: Checkout hitch
7878
uses: actions/checkout@v4
7979
with:
8080
repository: varnish/hitch
81-
ref: 1.7.3
81+
ref: 1.8.0
8282
path: hitch
8383

8484
# Do this before configuring so that it only detects the updated list of
@@ -92,9 +92,10 @@ jobs:
9292
- name: Configure and build hitch
9393
run: |
9494
cd $GITHUB_WORKSPACE/hitch/
95-
patch -p1 < $GITHUB_WORKSPACE/osp/hitch/hitch_1.7.3.patch
96-
autoreconf -ivf
97-
SSL_CFLAGS="-I$GITHUB_WORKSPACE/build-dir/include/ -I$GITHUB_WORKSPACE/build-dir/include/wolfssl" SSL_LIBS="-L$GITHUB_WORKSPACE/build-dir/lib -lwolfssl" ./configure --with-wolfssl=$GITHUB_WORKSPACE/build-dir/ --enable-silent-rules --enable-documentation --enable-warnings --with-lex --with-yacc --prefix=$GITHUB_WORKSPACE/build-dir
95+
patch -p1 < $GITHUB_WORKSPACE/osp/hitch/hitch_1.8.0.patch
96+
export SSL_CFLAGS="-I$GITHUB_WORKSPACE/build-dir/include/ -I$GITHUB_WORKSPACE/build-dir/include/wolfssl"
97+
export SSL_LIBS="-L$GITHUB_WORKSPACE/build-dir/lib -lwolfssl"
98+
./bootstrap --with-wolfssl=$GITHUB_WORKSPACE/build-dir/ --prefix=$GITHUB_WORKSPACE/build-dir
9899
make -j$(nproc)
99100
100101
- name: Confirm hitch built with wolfSSL

0 commit comments

Comments
 (0)