-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move crypto3 derivation into a separate file, and clean it up
This diff introduces the following changes: - crypto3 derivation moved into a separate file, as per usual Nix guidelines - enableDebug parameter added to crypto3 to switch debug modes on and off - enableDebug will build boost with debug symbols - flake-utils used to enumerate systems (as we do in nix-3rdparty) - devShells dropped from the toplevel. please use shellHoook in crypto3.nix instead This is all a set of standard practices to make your life easier and code cleaner. What still remains is to remove the hardcoding of test sets in the flake.nix. This usually is not recommended to program a lot of logic. The best place to do this would be in a shell script.
- Loading branch information
Showing
15 changed files
with
134 additions
and
628 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,5 @@ | ||
name: Crypto3 Build and Test on macOS Platforms | ||
|
||
on: | ||
workflow_call: | ||
inputs: | ||
submodules-refs: | ||
type: string | ||
description: "Lines with submodules' repo names and refs (e.g. `org/repo: ref`)" | ||
required: false | ||
|
||
env: | ||
TESTS_ARTIFACT_NAME: "test-results-mac" | ||
|
||
jobs: | ||
build-and-test: | ||
name: "Build and test macOS" | ||
|
@@ -20,58 +9,15 @@ jobs: | |
uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
submodules: recursive | ||
|
||
- name: Checkout submodules to specified refs | ||
if: inputs.submodules-refs != '' | ||
uses: NilFoundation/ci-cd/actions/[email protected] | ||
with: | ||
refs: ${{ inputs.submodules-refs }} | ||
paths: | | ||
${{ github.workspace }}/** | ||
!${{ github.workspace }}/ | ||
!${{ github.workspace }}/**/.git/** | ||
|
||
# From https://github.com/DeterminateSystems/magic-nix-cache-action | ||
- uses: DeterminateSystems/nix-installer-action@main | ||
- uses: DeterminateSystems/magic-nix-cache-action@main | ||
- uses: DeterminateSystems/flake-checker-action@main | ||
|
||
- name: Run checks | ||
run: nix flake -L check .?submodules=1# | ||
run: nix flake -L check | ||
env: | ||
NIX_CONFIG: | | ||
cores = 0 | ||
max-jobs = 1 | ||
- name: Copy test results | ||
run: | | ||
check_names=( | ||
"algebra-clang" | ||
"containers-clang" | ||
"hash-clang" | ||
"marshalling-algebra-clang" | ||
"marshalling-core-clang" | ||
"marshalling-zk-clang" | ||
"math-clang" | ||
"pubkey-clang" | ||
"zk-clang" | ||
) | ||
results_dir="./results" | ||
mkdir -p "$results_dir" | ||
for check_name in "${check_names[@]}"; do | ||
# This completes immediately since results are in cache | ||
nix build -L .?submodules=1#checks.aarch64-darwin.$check_name | ||
cp -r ./result/* "$results_dir/$check_name" | ||
rm result | ||
done | ||
- name: Publish Test Results | ||
uses: EnricoMi/publish-unit-test-result-action/linux@v2 | ||
with: | ||
check_name: "Mac Test Results" | ||
files: "results/**/*.xml" | ||
comment_mode: ${{ github.event.pull_request.head.repo.fork && 'off' || 'always' }} # Don't create PR comment from fork runs | ||
action_fail_on_inconclusive: true # fail, if no reports |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,34 +15,20 @@ concurrency: | |
cancel-in-progress: true | ||
|
||
jobs: | ||
handle-syncwith: | ||
if: github.event_name == 'pull_request' | ||
name: Call Reusable SyncWith Handler | ||
uses: NilFoundation/ci-cd/.github/workflows/[email protected] | ||
with: | ||
ci-cd-ref: 'v1.1.2' | ||
secrets: inherit | ||
|
||
test-linux: | ||
name: Linux Crypto3 Testing | ||
uses: ./.github/workflows/crypto3-testing-linux.yml | ||
needs: | ||
- handle-syncwith | ||
if: | | ||
always() && !cancelled() && | ||
(needs.handle-syncwith.result == 'success' || needs.handle-syncwith.result == 'skipped') | ||
always() && !cancelled() | ||
secrets: inherit | ||
with: | ||
submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }} | ||
|
||
test-mac: | ||
name: macOS Crypto3 Testing | ||
uses: ./.github/workflows/crypto3-testing-mac.yml | ||
needs: | ||
- handle-syncwith | ||
if: | | ||
always() && !cancelled() && | ||
(needs.handle-syncwith.result == 'success' || needs.handle-syncwith.result == 'skipped') | ||
always() && !cancelled() | ||
secrets: inherit | ||
with: | ||
submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.