Point CI back to liboqs main (#431)

Point CI back to liboqs main instead of 0.10.1 and increment working version to 0.6.2-dev. --------- Signed-off-by: Spencer Wilson <[email protected]>
open-quantum-safe · Jun 14, 2024 · 098a1c8 · 098a1c8
1 parent c4130ea
commit 098a1c8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
       - run:
           name: Clone and build liboqs (<< parameters.CMAKE_ARGS >>)
           command: |
-             git clone --depth 1 --branch 0.10.1 https://github.com/open-quantum-safe/liboqs.git &&
+             git clone --depth 1 --branch main https://github.com/open-quantum-safe/liboqs.git &&
              cd liboqs && mkdir _build && cd _build &&
              cmake -GNinja << parameters.CMAKE_ARGS >> -DCMAKE_INSTALL_PREFIX=$(pwd)/../../.local .. && ninja install &&
              cd .. && cd .. && pwd
@@ -158,7 +158,7 @@ jobs:
       - run:
           name: Clone and build liboqs
           command: |
-             git clone --depth 1 --branch 0.10.1 https://github.com/open-quantum-safe/liboqs.git &&
+             git clone --depth 1 --branch main https://github.com/open-quantum-safe/liboqs.git &&
              export LIBOQS_INSTALLPATH=$(pwd)/.local && cd liboqs && mkdir _build && cd _build &&
              export OPENSSL_INSTALL="$(brew --prefix << parameters.OPENSSL_PREINSTALL >> || echo "")"
              cmake -GNinja -DOPENSSL_ROOT_DIR="${OPENSSL_INSTALL}" -DCMAKE_INSTALL_PREFIX=$LIBOQS_INSTALLPATH << parameters.CMAKE_ARGS >> .. && ninja install &&

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -20,7 +20,7 @@ jobs:
       image: openquantumsafe/ci-ubuntu-jammy:latest
     env:
       MAKE_PARAMS: "-j 18"
-      LIBOQS_BRANCH: "0.10.1"
+      LIBOQS_BRANCH: "main"
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -118,7 +118,7 @@ jobs:
 
       - name: Clone and build liboqs with ASan
         run: |
-          git clone --depth=1 --branch 0.10.1 https://github.com/open-quantum-safe/liboqs.git liboqs
+          git clone --depth=1 --branch main https://github.com/open-quantum-safe/liboqs.git liboqs
           cd liboqs
           mkdir build install
           cmake -GNinja -B build \

diff --git a/.github/workflows/standalone.yml b/.github/workflows/standalone.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Full build
-        run: LIBOQS_BRANCH=0.10.1 ./scripts/fullbuild.sh
+        run: LIBOQS_BRANCH=main ./scripts/fullbuild.sh
       - name: Test
         run: ./scripts/runtests.sh -V
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -43,7 +43,7 @@ jobs:
         with:
           set-safe-directory: true
           repository: open-quantum-safe/liboqs
-          ref: 0.10.1
+          ref: main
           path: liboqs
       - name: Install cygwin
         uses: cygwin/cygwin-install-action@master
@@ -138,7 +138,7 @@ jobs:
         with:
           set-safe-directory: true
           repository: open-quantum-safe/liboqs
-          ref: 0.10.1
+          ref: main
           path: liboqs
       - uses: ilammy/msvc-dev-cmd@v1
         with:
@@ -252,7 +252,7 @@ jobs:
           with:
             set-safe-directory: true
             repository: open-quantum-safe/liboqs
-            ref: 0.10.1
+            ref: main
             path: liboqs
         - uses: ilammy/msvc-dev-cmd@v1
           with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ else()
 cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 endif()
 project(oqs-provider LANGUAGES C)
-set(OQSPROVIDER_VERSION_TEXT "0.6.1")
+set(OQSPROVIDER_VERSION_TEXT "0.6.2-dev")
 set(CMAKE_C_STANDARD 11)
 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")