From bd266b383d2e56db9d125e8b813bca91d522f795 Mon Sep 17 00:00:00 2001 From: Pavel Punsky Date: Thu, 25 Aug 2022 16:56:51 -0700 Subject: [PATCH 1/5] Add new actions: build and test with 3 different versions of openssl --- .github/workflows/openssl-versions.yml | 84 ++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 .github/workflows/openssl-versions.yml diff --git a/.github/workflows/openssl-versions.yml b/.github/workflows/openssl-versions.yml new file mode 100644 index 0000000..88f621c --- /dev/null +++ b/.github/workflows/openssl-versions.yml @@ -0,0 +1,84 @@ +name: OpenSSL compatibility + +on: + push: + branches: [ $default-branch ] + pull_request: + types: [ opened, reopened, synchronize ] + +jobs: + build: + + runs-on: ubuntu:22.04 + + steps: + - name: Install dependencies (OpenSSL-3.0.2) + run: | + sudo apt-get update + sudo apt-get install -y \ + libevent-dev \ + libssl-dev \ + libpq-dev libmariadb-dev libsqlite3-dev \ + libhiredis-dev \ + libmongoc-dev \ + libmicrohttpd-dev + - uses: actions/checkout@v3 + - name: configure + run: ./configure + - name: make + run: make + - name: make check + run: make check + - name: apps tests + run: cd examples && ./run_tests.sh + + + build: + + runs-on: ubuntu:20.04 (OpenSSL-1.1.1) + + steps: + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + libevent-dev \ + libssl-dev \ + libpq-dev libmariadb-dev libsqlite3-dev \ + libhiredis-dev \ + libmongoc-dev \ + libmicrohttpd-dev + - uses: actions/checkout@v3 + - name: configure + run: ./configure + - name: make + run: make + - name: make check + run: make check + - name: apps tests + run: cd examples && ./run_tests.sh + + build: + + runs-on: ubuntu:16.04 (OpenSSL-1.0.2) + + steps: + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + libevent-dev \ + libssl-dev \ + libpq-dev libmariadb-dev libsqlite3-dev \ + libhiredis-dev \ + libmongoc-dev \ + libmicrohttpd-dev + - uses: actions/checkout@v3 + - name: configure + run: ./configure + - name: make + run: make + - name: make check + run: make check + - name: apps tests + run: cd examples && ./run_tests.sh From 5a86dd373c542422d59c417e76b9d469f8e52f2e Mon Sep 17 00:00:00 2001 From: Pavel Punsky Date: Thu, 25 Aug 2022 19:48:51 -0700 Subject: [PATCH 2/5] no message --- .github/workflows/openssl-versions.yml | 34 ++------------------------ 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/.github/workflows/openssl-versions.yml b/.github/workflows/openssl-versions.yml index 88f621c..d44a503 100644 --- a/.github/workflows/openssl-versions.yml +++ b/.github/workflows/openssl-versions.yml @@ -8,9 +8,7 @@ on: jobs: build: - - runs-on: ubuntu:22.04 - + runs-on: ubuntu-22.04 steps: - name: Install dependencies (OpenSSL-3.0.2) run: | @@ -32,36 +30,8 @@ jobs: - name: apps tests run: cd examples && ./run_tests.sh - build: - - runs-on: ubuntu:20.04 (OpenSSL-1.1.1) - - steps: - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y \ - libevent-dev \ - libssl-dev \ - libpq-dev libmariadb-dev libsqlite3-dev \ - libhiredis-dev \ - libmongoc-dev \ - libmicrohttpd-dev - - uses: actions/checkout@v3 - - name: configure - run: ./configure - - name: make - run: make - - name: make check - run: make check - - name: apps tests - run: cd examples && ./run_tests.sh - - build: - - runs-on: ubuntu:16.04 (OpenSSL-1.0.2) - + runs-on: ubuntu-20.04 (OpenSSL-1.1.1) steps: - name: Install dependencies run: | From 9d3a649eded79e58a9831a9418a88261a2fbc2e4 Mon Sep 17 00:00:00 2001 From: Pavel Punsky Date: Thu, 25 Aug 2022 19:57:05 -0700 Subject: [PATCH 3/5] no message --- .../{openssl-versions.yml => openssl-3.yml} | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) rename .github/workflows/{openssl-versions.yml => openssl-3.yml} (53%) diff --git a/.github/workflows/openssl-versions.yml b/.github/workflows/openssl-3.yml similarity index 53% rename from .github/workflows/openssl-versions.yml rename to .github/workflows/openssl-3.yml index d44a503..c7170af 100644 --- a/.github/workflows/openssl-versions.yml +++ b/.github/workflows/openssl-3.yml @@ -1,4 +1,4 @@ -name: OpenSSL compatibility +name: OpenSSL-3.0 Compatibility on: push: @@ -29,26 +29,3 @@ jobs: run: make check - name: apps tests run: cd examples && ./run_tests.sh - - build: - runs-on: ubuntu-20.04 (OpenSSL-1.1.1) - steps: - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y \ - libevent-dev \ - libssl-dev \ - libpq-dev libmariadb-dev libsqlite3-dev \ - libhiredis-dev \ - libmongoc-dev \ - libmicrohttpd-dev - - uses: actions/checkout@v3 - - name: configure - run: ./configure - - name: make - run: make - - name: make check - run: make check - - name: apps tests - run: cd examples && ./run_tests.sh From 9d412d86b69446a2d3706ad1f9031d1aa48f73ac Mon Sep 17 00:00:00 2001 From: Pavel Punsky Date: Thu, 25 Aug 2022 20:00:11 -0700 Subject: [PATCH 4/5] Lock runner version on ubuntu 20.04 so we get openssl-1.1.1 --- .github/workflows/cmake.yaml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yaml b/.github/workflows/cmake.yaml index 33fd7c9..ee33620 100644 --- a/.github/workflows/cmake.yaml +++ b/.github/workflows/cmake.yaml @@ -12,7 +12,7 @@ env: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Install dependencies diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9b7cdf7..96c2b44 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Install dependencies From d06aef24b752a68d4c5eb7b3715fb726b50509e3 Mon Sep 17 00:00:00 2001 From: Pavel Punsky Date: Fri, 26 Aug 2022 10:49:31 -0700 Subject: [PATCH 5/5] Move to matrix structure --- .github/workflows/openssl-3.yml | 31 ------------------------------- .github/workflows/tests.yml | 10 ++++++---- 2 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 .github/workflows/openssl-3.yml diff --git a/.github/workflows/openssl-3.yml b/.github/workflows/openssl-3.yml deleted file mode 100644 index c7170af..0000000 --- a/.github/workflows/openssl-3.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: OpenSSL-3.0 Compatibility - -on: - push: - branches: [ $default-branch ] - pull_request: - types: [ opened, reopened, synchronize ] - -jobs: - build: - runs-on: ubuntu-22.04 - steps: - - name: Install dependencies (OpenSSL-3.0.2) - run: | - sudo apt-get update - sudo apt-get install -y \ - libevent-dev \ - libssl-dev \ - libpq-dev libmariadb-dev libsqlite3-dev \ - libhiredis-dev \ - libmongoc-dev \ - libmicrohttpd-dev - - uses: actions/checkout@v3 - - name: configure - run: ./configure - - name: make - run: make - - name: make check - run: make check - - name: apps tests - run: cd examples && ./run_tests.sh diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 96c2b44..64c9439 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,10 +7,12 @@ on: types: [ opened, reopened, synchronize ] jobs: - build: - - runs-on: ubuntu-20.04 - + builds: + strategy: + fail-fast: false + matrix: + os: [ubuntu-20.04, ubuntu-22.04] + runs-on: ${{ matrix.os }} steps: - name: Install dependencies run: |