Skip to content

Commit

Permalink
Fix broken circleci job for macOS
Browse files Browse the repository at this point in the history
This PR updates the openssl version to be installed for testing macOS builds

The circleci config file currently points to [email protected] to install openssl for macOS. This change was made as
part of the following [PR](080c3dd),
where previously `openssl@3` pointed to `openssl v3.0.x` which was causing errors trying to build oqs-provider.
So the change was made to specify `[email protected]`. OpenSSL v3.2 was released last week and the circleci jobs for
macOS started failing since `[email protected]` is no longer available to install using homebrew. Instead the following
are the options: `openssl@3` (which points to the current stable version, v3.2), `[email protected]` and `[email protected]`.

Changes made in this PR include:
- pointing the openssl version back to `openssl@3` since it now points to the latest 3.2
- a small doc change to the CONTRIBUTING doc to update the circleci command to run a specific job locally. (This
  command no longer accepts the --job option)
  • Loading branch information
johnma14 committed Nov 29, 2023
1 parent d540c28 commit 8b516f1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
- when:
condition:
not:
equal: [ openssl@3.1, << parameters.OPENSSL_PREINSTALL >> ]
equal: [ openssl@3, << parameters.OPENSSL_PREINSTALL >> ]
steps:
- run:
name: Clone and build OpenSSL(3) master
Expand All @@ -186,7 +186,7 @@ jobs:
fi
- when:
condition:
equal: [ openssl@3.1, << parameters.OPENSSL_PREINSTALL >> ]
equal: [ openssl@3, << parameters.OPENSSL_PREINSTALL >> ]
steps:
- run:
name: Build OQS-OpenSSL provider
Expand Down Expand Up @@ -301,12 +301,12 @@ workflows:
- macOS:
name: macOS-shared
CMAKE_ARGS: -DBUILD_SHARED_LIBS=ON -DOQS_DIST_BUILD=OFF -DOQS_ENABLE_KEM_CLASSIC_MCELIECE=OFF
OPENSSL_PREINSTALL: openssl@3.1
OPENSSL_PREINSTALL: openssl@3
- macOS:
name: macOS-static
OQS_PROVIDER_BUILD_STATIC: true
CMAKE_ARGS: -DOQS_DIST_BUILD=OFF -DOQS_ENABLE_KEM_CLASSIC_MCELIECE=OFF
OPENSSL_PREINSTALL: openssl@3.1
OPENSSL_PREINSTALL: openssl@3
on-main-branch:
when:
or:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ run the following command in the project main directory prior to finishing a PR:
If encountering CI errors in CircleCI, it may be helpful to execute the test jobs
locally to debug. This can be facilitated by executing the command

circleci local execute --job some-test-job
circleci local execute some-test-job

assuming "some-test-job" is the name of the test to be executed and the CircleCI
[command line tools have been installed](https://circleci.com/docs/local-cli).
Expand Down

0 comments on commit 8b516f1

Please sign in to comment.