diff --git a/.github/workflows/haproxy.yml b/.github/workflows/haproxy.yml index 75b526f4eb..37e8289639 100644 --- a/.github/workflows/haproxy.yml +++ b/.github/workflows/haproxy.yml @@ -67,28 +67,26 @@ jobs: uses: actions/cache@v4 id: cache-haproxy with: - path: build-dir/haproxy-${{matrix.haproxy-ref}} - key: haproxy-${{matrix.haproxy-ref}} + path: build-dir/haproxy-${{matrix.haproxy_ref}} + key: haproxy-${{matrix.haproxy_ref}} lookup-only: true - restore-keys: | - haproxy- - name: Download haproxy if needed if: steps.cache-haproxy.outputs.cache-hit != 'true' uses: actions/checkout@v3 with: repository: haproxy/haproxy - ref: ${{matrix.haproxy-ref}} - path: build-dir/haproxy-${{matrix.haproxy-ref}} + ref: ${{matrix.haproxy_ref}} + path: build-dir/haproxy-${{matrix.haproxy_ref}} - name: Build haproxy - working-directory: build-dir/haproxy-${{matrix.haproxy-ref}} + working-directory: build-dir/haproxy-${{matrix.haproxy_ref}} run: make TARGET=linux-glibc USE_OPENSSL_WOLFSSL=1 SSL_LIB=$GITHUB_WORKSPACE/build-dir/lib SSL_INC=$GITHUB_WORKSPACE/build-dir/include ADDLIB=-Wl,-rpath,$GITHUB_WORKSPACE/build-dir/lib CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address" - name: Build haproxy vtest - working-directory: build-dir/haproxy-${{matrix.haproxy-ref}} + working-directory: build-dir/haproxy-${{matrix.haproxy_ref}} run: ./scripts/build-vtest.sh - name: Test haproxy - working-directory: build-dir/haproxy-${{matrix.haproxy-ref}} + working-directory: build-dir/haproxy-${{matrix.haproxy_ref}} run: VTEST_PROGRAM=$GITHUB_WORKSPACE/build-dir/vtest/vtest make reg-tests -- --debug reg-tests/ssl/*