From 2361c5765d3077079d919fa975ad54f010b093b7 Mon Sep 17 00:00:00 2001
From: Spencer Wilson <spencer.wilson@uwaterloo.ca>
Date: Tue, 11 Jun 2024 15:28:09 -0400
Subject: [PATCH] Point CI back to liboqs main

---
 .circleci/config.yml             | 4 ++--
 .github/workflows/linux.yml      | 6 ++----
 .github/workflows/standalone.yml | 2 +-
 .github/workflows/windows.yml    | 3 ---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d7db6114..e5a9838b 100644
--- 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
index a276c3a6..7d380c7a 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -20,7 +20,6 @@ jobs:
       image: openquantumsafe/ci-ubuntu-jammy:latest
     env:
       MAKE_PARAMS: "-j 18"
-      LIBOQS_BRANCH: "0.10.1"
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -50,12 +49,11 @@ jobs:
       image: ${{ matrix.container }}
     env:
       MAKE_PARAMS: "-j 18"
-      LIBOQS_BRANCH: "0.10.1"
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Full build
-        run: OPENSSL_BRANCH=${{ matrix.ossl-branch }} ./scripts/fullbuild.sh
+        run: OPENSSL_BRANCH=${{ matrix.ossl-branch }} LIBOQS_BRANCH=0.10.1 ./scripts/fullbuild.sh
       - name: Enable sibling oqsprovider for testing
         run: cd _build/lib && ln -s oqsprovider.so oqsprovider2.so
       - name: Test
@@ -118,7 +116,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
index 999a2318..fbcfb162 100644
--- 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: ./scripts/fullbuild.sh
       - name: Test
         run: ./scripts/runtests.sh -V
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index fc5b211a..72003a42 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -43,7 +43,6 @@ jobs:
         with:
           set-safe-directory: true
           repository: open-quantum-safe/liboqs
-          ref: 0.10.1
           path: liboqs
       - name: Install cygwin
         uses: cygwin/cygwin-install-action@master
@@ -138,7 +137,6 @@ jobs:
         with:
           set-safe-directory: true
           repository: open-quantum-safe/liboqs
-          ref: 0.10.1
           path: liboqs
       - uses: ilammy/msvc-dev-cmd@v1
         with:
@@ -252,7 +250,6 @@ jobs:
           with:
             set-safe-directory: true
             repository: open-quantum-safe/liboqs
-            ref: 0.10.1
             path: liboqs
         - uses: ilammy/msvc-dev-cmd@v1
           with: