Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ jobs:
- run:
name: Check docs
command: python docs/check.py ./
- run:
name: Check conformance commits
command: conformance/scripts/verify-commits.sh

build_linux:
executor: linux-executor
Expand Down
11 changes: 11 additions & 0 deletions conformance/commits.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# The commits currently used in CI for sig's conformance with agave.

SOLANA_CONFORMANCE_COMMIT=d2bcbdc4b21d52d4579e87516d3eaad651e9f455
TEST_VECTORS_COMMIT=e0b55b1fd3d72532b87a53fa6c313c8a09e34164
SOLFUZZ_AGAVE_COMMIT=6c5035af319226680dea1c1d3622200e153a80a8

# protosol definitions needed for the above commit of solfuzz-agave
AGAVE_PROTOSOL_COMMIT=7064b0b09062de4d2e24ee4709cbe160e541bb0e

# protosol definitions used for sig
SIG_PROTOSOL_COMMIT=90ec31a506593fc9574d2c09f76e64d202b23124
2 changes: 1 addition & 1 deletion conformance/scripts/download_artifacts.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e

# Specifically this commit of solfuzz-agave: 7e7b4935d66e17b478910b8a1e43b461cbb43f7d
# Specifically this commit of solfuzz-agave: 6c5035af319226680dea1c1d3622200e153a80a8
artifact_id=3999155212
artifact_name="libsolfuzz-agave.so"

Expand Down
20 changes: 20 additions & 0 deletions conformance/scripts/verify-commits.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env bash
set -euo pipefail

# This script is a basic sanity check that the commit hashes in commits.env are
# consistent with our CI configuration. It's not perfect but checks for some
# obvious inconsistencies.

trap 'set +x; echo ❌ Failed to verify conformance commit at $LINENO: $BASH_COMMAND' ERR

# ensure working directory is repository root
cd $(dirname "${BASH_SOURCE[0]}")/../..

. conformance/commits.env

grep "git checkout $SOLANA_CONFORMANCE_COMMIT" .circleci/config.yml > /dev/null
grep "git checkout $TEST_VECTORS_COMMIT" .circleci/config.yml > /dev/null
grep "solfuzz-agave: $SOLFUZZ_AGAVE_COMMIT" conformance/scripts/download_artifacts.sh > /dev/null
grep "// current commit: $SIG_PROTOSOL_COMMIT" conformance/build.zig > /dev/null

echo ✅ Verified conformance commits.