Skip to content

Commit 2d8d563

Browse files
committed
[agave-runtime]: ci update (#1)
1 parent e2c332b commit 2d8d563

3 files changed

Lines changed: 59 additions & 65 deletions

File tree

.buildkite/hooks/post-command

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -35,61 +35,61 @@ else
3535
SUCCESS=false
3636
fi
3737

38-
if [[ -n $BUILDKITE ]]; then
39-
if need_to_upload_test_result; then
40-
if [[ -f "results.json" ]]; then
41-
# extract lines which start with '{'
42-
awk '/{.*/' results.json >sanitized-results.json
43-
44-
if [[ -n "$BUILDKITE_ANALYTICS_TOKEN" ]]; then
45-
echo "~~~ Uploading test results to Buildkite Analytics"
46-
buildkite-test-collector <sanitized-results.json
47-
else
48-
echo "~~~ Ignore uploading to Buildkite Analytics"
49-
fi
50-
51-
if [[ -n "$DATADOG_API_KEY" ]]; then
52-
echo "~~~ Uploading test results to Datadog"
53-
cargo2junit >results.xml <sanitized-results.json || true
54-
if [[ -f "results.xml" ]]; then
55-
datadog-ci junit upload --service solana results.xml
56-
fi
57-
else
58-
echo "~~~ Ignore Uploading to Datadog"
59-
fi
60-
fi
61-
62-
if [[ -f "target/nextest/ci/junit.xml" ]]; then
63-
if [[ -n "$BUILDKITE_ANALYTICS_TOKEN" ]]; then
64-
echo "~~~ Uploading test results to Buildkite Analytics"
65-
curl \
66-
-X POST \
67-
-H "Authorization: Token token=\"$BUILDKITE_ANALYTICS_TOKEN\"" \
68-
-F "data=@target/nextest/ci/junit.xml" \
69-
-F "format=junit" \
70-
-F "run_env[CI]=buildkite" \
71-
-F "run_env[key]=$BUILDKITE_BUILD_ID" \
72-
-F "run_env[url]=$BUILDKITE_BUILD_URL" \
73-
-F "run_env[branch]=$BUILDKITE_BRANCH" \
74-
-F "run_env[commit_sha]=$BUILDKITE_COMMIT" \
75-
-F "run_env[number]=$BUILDKITE_BUILD_NUMBER" \
76-
-F "run_env[job_id]=$BUILDKITE_JOB_ID" \
77-
-F "run_env[message]=$BUILDKITE_MESSAGE" \
78-
https://analytics-api.buildkite.com/v1/uploads
79-
echo # add a break line for previous command
80-
else
81-
echo "~~~ Ignore uploading to Buildkite Analytics"
82-
fi
83-
84-
if [[ -n "$DATADOG_API_KEY" ]]; then
85-
echo "~~~ Uploading test results to Datadog"
86-
datadog-ci junit upload --service solana target/nextest/ci/junit.xml
87-
else
88-
echo "~~~ Ignore Uploading to Datadog"
89-
fi
90-
fi
91-
fi
92-
fi
38+
# if [[ -n $BUILDKITE ]]; then
39+
# if need_to_upload_test_result; then
40+
# if [[ -f "results.json" ]]; then
41+
# # extract lines which start with '{'
42+
# awk '/{.*/' results.json >sanitized-results.json
43+
44+
# if [[ -n "$BUILDKITE_ANALYTICS_TOKEN" ]]; then
45+
# echo "~~~ Uploading test results to Buildkite Analytics"
46+
# buildkite-test-collector <sanitized-results.json
47+
# else
48+
# echo "~~~ Ignore uploading to Buildkite Analytics"
49+
# fi
50+
51+
# if [[ -n "$DATADOG_API_KEY" ]]; then
52+
# echo "~~~ Uploading test results to Datadog"
53+
# cargo2junit >results.xml <sanitized-results.json || true
54+
# if [[ -f "results.xml" ]]; then
55+
# datadog-ci junit upload --service solana results.xml
56+
# fi
57+
# else
58+
# echo "~~~ Ignore Uploading to Datadog"
59+
# fi
60+
# fi
61+
62+
# if [[ -f "target/nextest/ci/junit.xml" ]]; then
63+
# if [[ -n "$BUILDKITE_ANALYTICS_TOKEN" ]]; then
64+
# echo "~~~ Uploading test results to Buildkite Analytics"
65+
# curl \
66+
# -X POST \
67+
# -H "Authorization: Token token=\"$BUILDKITE_ANALYTICS_TOKEN\"" \
68+
# -F "data=@target/nextest/ci/junit.xml" \
69+
# -F "format=junit" \
70+
# -F "run_env[CI]=buildkite" \
71+
# -F "run_env[key]=$BUILDKITE_BUILD_ID" \
72+
# -F "run_env[url]=$BUILDKITE_BUILD_URL" \
73+
# -F "run_env[branch]=$BUILDKITE_BRANCH" \
74+
# -F "run_env[commit_sha]=$BUILDKITE_COMMIT" \
75+
# -F "run_env[number]=$BUILDKITE_BUILD_NUMBER" \
76+
# -F "run_env[job_id]=$BUILDKITE_JOB_ID" \
77+
# -F "run_env[message]=$BUILDKITE_MESSAGE" \
78+
# https://analytics-api.buildkite.com/v1/uploads
79+
# echo # add a break line for previous command
80+
# else
81+
# echo "~~~ Ignore uploading to Buildkite Analytics"
82+
# fi
83+
84+
# if [[ -n "$DATADOG_API_KEY" ]]; then
85+
# echo "~~~ Uploading test results to Datadog"
86+
# datadog-ci junit upload --service solana target/nextest/ci/junit.xml
87+
# else
88+
# echo "~~~ Ignore Uploading to Datadog"
89+
# fi
90+
# fi
91+
# fi
92+
# fi
9393

9494
point_tags="pipeline=$BUILDKITE_PIPELINE_SLUG,job=$CI_LABEL,pr=$PR,success=$SUCCESS"
9595
point_tags="${point_tags// /\\ }" # Escape spaces

ci/channel-info.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ here="$(dirname "$0")"
1111
# shellcheck source=ci/semver_bash/semver.sh
1212
source "$here"/semver_bash/semver.sh
1313

14-
remote=https://github.com/anza-xyz/agave.git
14+
remote=https://github.com/anza-xyz/agave-runtime.git
1515

1616
# Fetch all vX.Y.Z tags
1717
#

ci/xtask/src/commands/generate_pipeline.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn annotate_pull_request(pr_number: u64) -> Result<()> {
111111
}
112112

113113
let annotation =
114-
format!("Github Pull Request: https://github.com/anza-xyz/agave/pull/{pr_number}");
114+
format!("Github Pull Request: https://github.com/anza-xyz/agave-runtime/pull/{pr_number}");
115115

116116
let status = Command::new("buildkite-agent")
117117
.args([
@@ -157,7 +157,7 @@ async fn get_changed_files(pr_number: u64) -> Result<Vec<String>> {
157157
};
158158
let github_client = github_client_builder.build()?;
159159
let stream = github_client
160-
.pulls("anza-xyz", "agave")
160+
.pulls("anza-xyz", "agave-runtime")
161161
.list_files(pr_number)
162162
.await?
163163
.into_stream(&github_client);
@@ -280,13 +280,7 @@ impl PullRequestPipelineFlags {
280280
|| changed_files
281281
.iter()
282282
.any(|file| file.ends_with("ci/test-shuttle.sh")),
283-
coverage: trigger_all
284-
|| rust_changed
285-
|| changed_files.iter().any(|file| {
286-
file.ends_with("scripts/coverage.sh")
287-
|| file.ends_with("ci/test-coverage.sh")
288-
|| file.starts_with("ci/coverage/")
289-
}),
283+
coverage: false,
290284
}
291285
}
292286
}

0 commit comments

Comments
 (0)