From d33f60d25c1b44d81b8c09c41e8fdb776415bb3c Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:41:31 +0100 Subject: [PATCH] exclude non-applicable CI Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .circleci/config.yml | 3 +++ .github/workflows/linux.yml | 4 ++-- .github/workflows/macos.yml | 3 ++- .github/workflows/windows.yml | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00029830..349a03fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -116,6 +116,9 @@ jobs: workflows: version: 2.1 build: + when: + and: + - not equal: [ dtls-1.3 , << pipeline.git.branch >> ] jobs: - macOS: name: macOS-noopenssl diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c96c3f36..1fb9fca5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -103,7 +103,7 @@ jobs: CXX: "clang++" ASAN_C_FLAGS: "-fsanitize=address -fno-omit-frame-pointer" ASAN_OPTIONS: "detect_stack_use_after_return=1,detect_leaks=1" - OPENSSL_BRANCH: "openssl-3.3.2" + OPENSSL_BRANCH: "feature/dtls-1.3" steps: - name: Checkout code uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4 @@ -174,7 +174,7 @@ jobs: container: image: openquantumsafe/ci-ubuntu-jammy:latest env: - OPENSSL_BRANCH: "master" + OPENSSL_BRANCH: "feature/dtls-1.3" INSTALL_DIR: "/opt/install" CMAKE_TOOLCHAIN_FILE: "/opt/linux-aarch64-toolchain.cmake" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0c537db7..54b03269 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,6 +1,7 @@ name: MacOS tests -on: [pull_request, push] +# Disable for DTLS1.3 for now (TODO) +# on: [pull_request, push] permissions: contents: read diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d9876120..3d8a43f0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,6 +1,7 @@ name: Windows tests -on: [pull_request, push] +# Disable for DTLS1.3 for now (TODO) +#on: [pull_request, push] permissions: contents: read