Skip to content

Commit

Permalink
gha: move the event-based test over from Zuul
Browse files Browse the repository at this point in the history
Switched libssh2 to libssh

Closes #8490
  • Loading branch information
bagder committed Mar 21, 2022
1 parent 02173e2 commit 5bb4d3e
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 24 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/event-based.yml
@@ -0,0 +1,42 @@
name: event-based

on:
# Trigger the workflow on push or pull requests, but only for the
# master branch
push:
branches:
- master
- '*/ci'
pull_request:
branches:
- master

jobs:
autotools:
name: ${{ matrix.build.name }}
runs-on: 'ubuntu-latest'
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
build:
- name: event tests
install:
configure: --enable-debug --disable-shared --disable-threaded-resolver --enable-werror --with-libssh --with-openssl
tflags: -n -e '!TLS-SRP'

steps:
- run: |
sudo apt-get install libtool autoconf automake pkg-config stunnel4 python3-pip libpsl-dev libbrotli-dev libzstd-dev libssh-dev
sudo pip3 install impacket
name: install prereqs and impacket
- uses: actions/checkout@v2

- run: autoreconf -fi && ./configure ${{ matrix.build.configure }} && make V=1
name: 'configure and build'

- run: make V=1 test-ci
name: 'test'
env:
TFLAGS: "${{ matrix.build.tflags }}"
7 changes: 0 additions & 7 deletions scripts/zuul/script.sh
Expand Up @@ -42,13 +42,6 @@ if [ "$T" = "torture" ]; then
make "TFLAGS=-n --shallow=20 -t $tests" test-nonflaky
fi

if [ "$T" = "events" ]; then
./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2 --with-openssl
make
tests="!TLS-SRP"
make "TFLAGS=-n -e $tests" test-nonflaky
fi

if [ "$T" = "debug" ]; then
./configure --enable-debug --enable-werror $C
make
Expand Down
17 changes: 0 additions & 17 deletions zuul.d/jobs.yaml
Expand Up @@ -292,22 +292,6 @@
CXX: g++-8
T: torture

- job:
name: curl-events
parent: curl-base
vars:
curl_apt_packages:
- lcov
- libpsl-dev
- libssl-dev
- libbrotli-dev
- libzstd-dev
- libssh2-1-dev
curl_env:
CC: gcc-8
CXX: g++-8
T: events

- job:
name: curl-fuzzer
parent: curl-base
Expand Down Expand Up @@ -385,7 +369,6 @@
- curl-cmake-boringssl-quiche
- curl-cmake-ngtcp2
- curl-torture
- curl-events
- curl-fuzzer
- curl-tidy
- curl-debug-clang-with-openssl-dl-ubsan
Expand Down

0 comments on commit 5bb4d3e

Please sign in to comment.