Skip to content

Commit ba3426d

Browse files
AshwinSekarcarllin
authored andcommitted
integrate aspenglow vote program (#63)
1 parent 3526021 commit ba3426d

File tree

9 files changed

+175
-252
lines changed

9 files changed

+175
-252
lines changed

Cargo.lock

Lines changed: 28 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ check-cfg = [
171171

172172
[workspace.dependencies]
173173
Inflector = "0.11.4"
174+
alpenglow-vote = { git = "ssh://[email protected]/solana-program/alpenglow-vote.git", rev = "3c4c514" }
175+
# alpenglow-vote = { path = "../alpenglow-vote/program" }
174176
axum = "0.7.9"
175177
agave-banking-stage-ingress-types = { path = "banking-stage-ingress-types", version = "=2.3.0" }
176178
agave-transaction-view = { path = "transaction-view", version = "=2.3.0" }

ci/docker-run.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,12 @@ fi
9191

9292
# Ensure files are created with the current host uid/gid
9393
if [[ -z "$SOLANA_DOCKER_RUN_NOSETUID" ]]; then
94-
ARGS+=(--user "$(id -u):$(id -g)")
94+
ARGS+=(
95+
--user "$(id -u):$(id -g)"
96+
--volume "/etc/passwd:/etc/passwd:ro"
97+
--volume "/etc/group:/etc/group:ro"
98+
--volume "/var/lib/buildkite-agent:/var/lib/buildkite-agent"
99+
)
95100
fi
96101

97102
if [[ -n $SOLANA_ALLOCATE_TTY ]]; then
@@ -117,6 +122,7 @@ ARGS+=(
117122
--env CI_PULL_REQUEST
118123
--env CI_REPO_SLUG
119124
--env CRATES_IO_TOKEN
125+
--env CARGO_NET_GIT_FETCH_WITH_CLI
120126
)
121127

122128
# Also propagate environment variables needed for codecov

core/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ codecov = { repository = "solana-labs/solana", branch = "master", service = "git
1717
agave-banking-stage-ingress-types = { workspace = true }
1818
agave-transaction-view = { workspace = true }
1919
ahash = { workspace = true }
20+
alpenglow-vote = { workspace = true, features = ["serde"] }
2021
anyhow = { workspace = true }
2122
arrayvec = { workspace = true }
2223
assert_matches = { workspace = true }
@@ -145,6 +146,7 @@ dev-context-only-utils = [
145146
frozen-abi = [
146147
"dep:solana-frozen-abi",
147148
"dep:solana-frozen-abi-macro",
149+
"alpenglow-vote/frozen-abi",
148150
"solana-accounts-db/frozen-abi",
149151
"solana-bloom/frozen-abi",
150152
"solana-compute-budget/frozen-abi",

0 commit comments

Comments
 (0)