Skip to content

Commit

Permalink
Merge pull request #535 from open-quantum-safe/ps-dev
Browse files Browse the repository at this point in the history
Switch to dev mode again
  • Loading branch information
praveksharma authored Oct 8, 2024
2 parents 2615bba + 8705750 commit a833147
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
image: openquantumsafe/ci-ubuntu-jammy:latest
env:
MAKE_PARAMS: "-j 18"
LIBOQS_BRANCH: "0.11.0"
LIBOQS_BRANCH: "main"
steps:
- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
- name: Full build
run: OPENSSL_BRANCH=${{ matrix.ossl-branch }} LIBOQS_BRANCH=0.11.0 OQS_LIBJADE_BUILD=${{ matrix.libjade-build }} ./scripts/fullbuild.sh
run: OPENSSL_BRANCH=${{ matrix.ossl-branch }} LIBOQS_BRANCH=main OQS_LIBJADE_BUILD=${{ matrix.libjade-build }} ./scripts/fullbuild.sh
- name: Enable sibling oqsprovider for testing
run: cd _build/lib && ln -s oqsprovider.so oqsprovider2.so
- name: Test
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
- name: Clone and build liboqs with ASan
run: |
git clone --depth=1 --branch 0.11.0 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 \
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
- name: Clone and build liboqs for linux-aarch64
working-directory: /opt/
run: |
git clone --depth=1 --branch 0.11.0 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 --toolchain "${CMAKE_TOOLCHAIN_FILE}" \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
with:
set-safe-directory: true
repository: open-quantum-safe/liboqs
ref: 0.11.0
ref: main
path: liboqs
- name: Retrieve OpenSSL32 from cache
id: cache-openssl32
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
with:
set-safe-directory: true
repository: open-quantum-safe/liboqs
ref: 0.11.0
ref: main
path: liboqs
- name: Install cygwin
uses: cygwin/cygwin-install-action@master
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
with:
set-safe-directory: true
repository: open-quantum-safe/liboqs
ref: 0.11.0
ref: main
path: liboqs
- uses: ilammy/msvc-dev-cmd@v1
with:
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
with:
set-safe-directory: true
repository: open-quantum-safe/liboqs
ref: 0.11.0
ref: main
path: liboqs
- uses: ilammy/msvc-dev-cmd@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ else()
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
endif()
project(oqs-provider LANGUAGES C)
set(OQSPROVIDER_VERSION_TEXT "0.7.0")
set(OQSPROVIDER_VERSION_TEXT "0.7.1-dev")
set(CMAKE_C_STANDARD 11)
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
Expand Down

0 comments on commit a833147

Please sign in to comment.