Skip to content

Commit 75c2e5e

Browse files
willhickeywen-coding
authored andcommitted
Revert "[anza migration] ci (solana-labs#5)"
This reverts commit b0022d7.
1 parent 62095f1 commit 75c2e5e

File tree

10 files changed

+192
-36
lines changed

10 files changed

+192
-36
lines changed

.mergify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pull_request_rules:
3333
actions:
3434
request_reviews:
3535
teams:
36-
- "@anza-xyz/community-pr-subscribers"
36+
- "@solana-labs/community-pr-subscribers"
3737
- name: label changes from monorepo-triage
3838
conditions:
3939
- author≠@anza
@@ -111,7 +111,7 @@ pull_request_rules:
111111
actions:
112112
backport:
113113
assignees: &BackportAssignee
114-
- "{{ merged_by|replace('mergify[bot]', label|select('equalto', 'community')|first|default(author)|replace('community', '@anza-xyz/community-pr-subscribers')) }}"
114+
- "{{ merged_by|replace('mergify[bot]', label|select('equalto', 'community')|first|default(author)|replace('community', '@solana-labs/community-pr-subscribers')) }}"
115115
title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
116116
ignore_conflicts: true
117117
labels:

.travis.yml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
branches:
2+
only:
3+
- master
4+
- /^v\d+\.\d+/
5+
6+
notifications:
7+
email: false
8+
slack:
9+
on_success: change
10+
if: NOT type = pull_request
11+
secure: F4IjOE05MyaMOdPRL+r8qhs7jBvv4yDM3RmFKE1zNXnfUOqV4X38oQM1EI+YVsgpMQLj/pxnEB7wcTE4Bf86N6moLssEULCpvAuMVoXj4QbWdomLX+01WbFa6fLVeNQIg45NHrz2XzVBhoKOrMNnl+QI5mbR2AlS5oqsudHsXDnyLzZtd4Y5SDMdYG1zVWM01+oNNjgNfjcCGmOE/K0CnOMl6GPi3X9C34tJ19P2XT7MTDsz1/IfEF7fro2Q8DHEYL9dchJMoisXSkem5z7IDQkGzXsWdWT4NnndUvmd1MlTCE9qgoXDqRf95Qh8sB1Dz08HtvgfaosP2XjtNTfDI9BBYS15Ibw9y7PchAJE1luteNjF35EOy6OgmCLw/YpnweqfuNViBZz+yOPWXVC0kxnPIXKZ1wyH9ibeH6E4hr7a8o9SV/6SiWIlbYF+IR9jPXyTCLP/cc3sYljPWxDnhWFwFdRVIi3PbVAhVu7uWtVUO17Oc9gtGPgs/GrhOMkJfwQPXaudRJDpVZowxTX4x9kefNotlMAMRgq+Drbmgt4eEBiCNp0ITWgh17BiE1U09WS3myuduhoct85+FoVeaUkp1sxzHVtGsNQH0hcz7WcpZyOM+AwistJA/qzeEDQao5zi1eKWPbO2xAhi2rV1bDH6bPf/4lDBwLRqSiwvlWU=
12+
13+
os: linux
14+
dist: bionic
15+
language: minimal
16+
17+
jobs:
18+
include:
19+
- &release-artifacts
20+
if: type IN (api, cron) OR tag IS present
21+
name: "macOS release artifacts"
22+
os: osx
23+
osx_image: xcode12
24+
language: rust
25+
rust:
26+
- stable
27+
install:
28+
- source ci/rust-version.sh
29+
- PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
30+
- readlink -f .
31+
- brew install gnu-tar
32+
- PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"
33+
- tar --version
34+
script:
35+
- source ci/env.sh
36+
- rustup set profile default
37+
- ci/publish-tarball.sh
38+
deploy:
39+
- provider: s3
40+
access_key_id: $AWS_ACCESS_KEY_ID
41+
secret_access_key: $AWS_SECRET_ACCESS_KEY
42+
bucket: release.solana.com
43+
region: us-west-1
44+
skip_cleanup: true
45+
acl: public_read
46+
local_dir: travis-s3-upload
47+
on:
48+
all_branches: true
49+
- provider: releases
50+
token: $GITHUB_TOKEN
51+
skip_cleanup: true
52+
file_glob: true
53+
file: travis-release-upload/*
54+
on:
55+
tags: true
56+
- <<: *release-artifacts
57+
name: "Windows release artifacts"
58+
os: windows
59+
install:
60+
- choco install openssl
61+
- export OPENSSL_DIR="C:\Program Files\OpenSSL-Win64"
62+
- source ci/rust-version.sh
63+
- PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
64+
- readlink -f .
65+
# Linux release artifacts are still built by ci/buildkite-secondary.yml
66+
#- <<: *release-artifacts
67+
# name: "Linux release artifacts"
68+
# os: linux
69+
# before_install:
70+
# - sudo apt-get install libssl-dev libudev-dev
71+
72+
# docs pull request
73+
- name: "docs"
74+
if: type IN (push, pull_request) OR tag IS present
75+
language: node_js
76+
node_js:
77+
- "lts/*"
78+
79+
services:
80+
- docker
81+
82+
cache:
83+
directories:
84+
- ~/.npm
85+
86+
before_install:
87+
- source ci/env.sh
88+
- .travis/channel_restriction.sh edge beta || travis_terminate 0
89+
- .travis/affects.sh docs/ .travis || travis_terminate 0
90+
- cd docs/
91+
- source .travis/before_install.sh
92+
93+
script:
94+
- source .travis/script.sh

README.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
22
<a href="https://solana.com">
3-
<img alt="Solana" src="https://i.imgur.com/0vfIMHo.png" width="250" />
3+
<img alt="Solana" src="https://i.imgur.com/IKyzQ6T.png" width="250" />
44
</a>
55
</p>
66

@@ -116,3 +116,35 @@ problem is solved by this code?" On the other hand, if a test does fail and you
116116
better way to solve the same problem, a Pull Request with your solution would most certainly be
117117
welcome! Likewise, if rewriting a test can better communicate what code it's protecting, please
118118
send us that patch!
119+
120+
# Disclaimer
121+
122+
All claims, content, designs, algorithms, estimates, roadmaps,
123+
specifications, and performance measurements described in this project
124+
are done with the Solana Labs, Inc. (“SL”) good faith efforts. It is up to
125+
the reader to check and validate their accuracy and truthfulness.
126+
Furthermore, nothing in this project constitutes a solicitation for
127+
investment.
128+
129+
Any content produced by SL or developer resources that SL provides are
130+
for educational and inspirational purposes only. SL does not encourage,
131+
induce or sanction the deployment, integration or use of any such
132+
applications (including the code comprising the Solana blockchain
133+
protocol) in violation of applicable laws or regulations and hereby
134+
prohibits any such deployment, integration or use. This includes the use of
135+
any such applications by the reader (a) in violation of export control
136+
or sanctions laws of the United States or any other applicable
137+
jurisdiction, (b) if the reader is located in or ordinarily resident in
138+
a country or territory subject to comprehensive sanctions administered
139+
by the U.S. Office of Foreign Assets Control (OFAC), or (c) if the
140+
reader is or is working on behalf of a Specially Designated National
141+
(SDN) or a person subject to similar blocking or denied party
142+
prohibitions.
143+
144+
The reader should be aware that U.S. export control and sanctions laws prohibit
145+
U.S. persons (and other persons that are subject to such laws) from transacting
146+
with persons in certain countries and territories or that are on the SDN list.
147+
Accordingly, there is a risk to individuals that other persons using any of the
148+
code contained in this repo, or a derivation thereof, may be sanctioned persons
149+
and that transactions with such persons would be a violation of U.S. export
150+
controls and sanctions law.

ci/buildkite-pipeline-in-disk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ if [[ -n $BUILDKITE_TAG ]]; then
276276
start_pipeline "Tag pipeline for $BUILDKITE_TAG"
277277

278278
annotate --style info --context release-tag \
279-
"https://github.com/anza-xyz/agave/releases/$BUILDKITE_TAG"
279+
"https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"
280280

281281
# Jump directly to the secondary build to publish release artifacts quickly
282282
trigger_secondary_step
@@ -294,7 +294,7 @@ if [[ $BUILDKITE_BRANCH =~ ^pull ]]; then
294294

295295
# Add helpful link back to the corresponding Github Pull Request
296296
annotate --style info --context pr-backlink \
297-
"Github Pull Request: https://github.com/anza-xyz/agave/$BUILDKITE_BRANCH"
297+
"Github Pull Request: https://github.com/solana-labs/solana/$BUILDKITE_BRANCH"
298298

299299
pull_or_push_steps
300300
exit 0

ci/buildkite-pipeline.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ EOF
161161

162162
trigger_secondary_step() {
163163
cat >> "$output_file" <<"EOF"
164-
- name: "Trigger Build on agave-secondary"
165-
trigger: "agave-secondary"
164+
- name: "Trigger Build on solana-secondary"
165+
trigger: "solana-secondary"
166166
branches: "!pull/*"
167167
async: true
168168
soft_fail: true
@@ -337,7 +337,7 @@ if [[ -n $BUILDKITE_TAG ]]; then
337337
start_pipeline "Tag pipeline for $BUILDKITE_TAG"
338338

339339
annotate --style info --context release-tag \
340-
"https://github.com/anza-xyz/agave/releases/$BUILDKITE_TAG"
340+
"https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"
341341

342342
# Jump directly to the secondary build to publish release artifacts quickly
343343
trigger_secondary_step
@@ -355,7 +355,7 @@ if [[ $BUILDKITE_BRANCH =~ ^pull ]]; then
355355

356356
# Add helpful link back to the corresponding Github Pull Request
357357
annotate --style info --context pr-backlink \
358-
"Github Pull Request: https://github.com/anza-xyz/agave/$BUILDKITE_BRANCH"
358+
"Github Pull Request: https://github.com/solana-labs/solana/$BUILDKITE_BRANCH"
359359

360360
pull_or_push_steps
361361
exit 0

ci/buildkite-solana-private.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ if [[ $BUILDKITE_BRANCH =~ ^pull ]]; then
259259

260260
# Add helpful link back to the corresponding Github Pull Request
261261
annotate --style info --context pr-backlink \
262-
"Github Pull Request: https://github.com/anza-xyz/agave/$BUILDKITE_BRANCH"
262+
"Github Pull Request: https://github.com/solana-labs/solana/$BUILDKITE_BRANCH"
263263

264264
pull_or_push_steps
265265
exit 0

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/solana-labs/solana.git
1515

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

ci/dependabot-pr.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
cd "$(dirname "$0")/.."
6+
7+
if ! echo "$BUILDKITE_BRANCH" | grep -E '^pull/[0-9]+/head$'; then
8+
echo "not pull request!?" >&2
9+
exit 1
10+
fi
11+
12+
source ci/rust-version.sh stable
13+
14+
ci/docker-run-default-image.sh ci/dependabot-updater.sh
15+
16+
if [[ $(git status --short :**/Cargo.lock | wc -l) -eq 0 ]]; then
17+
echo --- ok
18+
exit 0
19+
fi
20+
21+
echo --- "(FAILING) Backpropagating dependabot-triggered Cargo.lock updates"
22+
23+
name="dependabot-buildkite"
24+
api_base="https://api.github.com/repos/solana-labs/solana/pulls"
25+
pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+')
26+
branch=$(curl -s "$api_base/$pr_num" | python3 -c 'import json,sys;print(json.load(sys.stdin)["head"]["ref"])')
27+
28+
git add :**/Cargo.lock
29+
30+
GIT_AUTHOR_NAME="$name" \
31+
GIT_COMMITTER_NAME="$name" \
32+
git commit -m "[auto-commit] Update all Cargo lock files"
33+
git push origin "HEAD:$branch"
34+
35+
echo "Source branch is updated; failing this build for the next"
36+
exit 1

ci/rust-version.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,23 @@ fi
2929
if [[ -n $RUST_NIGHTLY_VERSION ]]; then
3030
nightly_version="$RUST_NIGHTLY_VERSION"
3131
else
32-
nightly_version=2025-02-16
32+
nightly_version=2024-01-05
3333
fi
3434

3535

3636
export rust_stable="$stable_version"
3737

3838
export rust_nightly=nightly-"$nightly_version"
3939

40+
export ci_docker_image="solanalabs/ci:rust_${rust_stable}_${rust_nightly}"
41+
4042
[[ -z $1 ]] || (
4143

4244
rustup_install() {
4345
declare toolchain=$1
4446
if ! cargo +"$toolchain" -V > /dev/null; then
4547
echo "$0: Missing toolchain? Installing...: $toolchain" >&2
46-
rustup install "$toolchain" --no-self-update
48+
rustup install "$toolchain"
4749
cargo +"$toolchain" -V
4850
fi
4951
}

ci/test-coverage.sh

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,36 @@
11
#!/usr/bin/env bash
2-
32
set -e
4-
here=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
5-
6-
# shellcheck source=ci/upload-ci-artifact.sh
7-
source "$here/upload-ci-artifact.sh"
8-
9-
if [[ -z $CI ]]; then
10-
echo "This script is used by CI environment. \
11-
Use \`scripts/coverage.sh\` directly if you only want to obtain the coverage report"
12-
exit 1
13-
fi
3+
cd "$(dirname "$0")/.."
144

155
annotate() {
166
${BUILDKITE:-false} && {
177
buildkite-agent annotate "$@"
188
}
199
}
2010

21-
# run coverage for all
22-
SHORT_CI_COMMIT=${CI_COMMIT:0:9}
23-
COMMIT_HASH=$SHORT_CI_COMMIT "$here/../scripts/coverage.sh" "$@"
11+
source ci/upload-ci-artifact.sh
12+
source scripts/ulimit-n.sh
13+
14+
scripts/coverage.sh "$@"
15+
16+
if [[ -z $CI ]]; then
17+
exit
18+
fi
2419

25-
# compress coverage reports
26-
HTML_REPORT_TAR_NAME="coverage.tar.gz"
27-
HTML_REPORT_TAR_PATH="$here/../target/cov/${SHORT_CI_COMMIT}/$HTML_REPORT_TAR_NAME"
28-
tar zcf "$HTML_REPORT_TAR_PATH" "$here/../target/cov/${SHORT_CI_COMMIT}/coverage"
20+
report=coverage-"${CI_COMMIT:0:9}".tar.gz
21+
mv target/cov/report.tar.gz "$report"
22+
upload-ci-artifact "$report"
2923

30-
# upload reports to buildkite
31-
upload-ci-artifact "$HTML_REPORT_TAR_PATH"
3224
annotate --style success --context lcov-report \
33-
"lcov report: <a href=\"artifact://$HTML_REPORT_TAR_NAME\">$HTML_REPORT_TAR_NAME</a>"
25+
"lcov report: <a href=\"artifact://$report\">$report</a>"
3426

3527
echo "--- codecov.io report"
3628
if [[ -z "$CODECOV_TOKEN" ]]; then
3729
echo "^^^ +++"
3830
echo CODECOV_TOKEN undefined, codecov.io upload skipped
3931
else
40-
codecov -t "${CODECOV_TOKEN}" --dir "$here/../target/cov/${SHORT_CI_COMMIT}"
32+
codecov -t "${CODECOV_TOKEN}"
4133

4234
annotate --style success --context codecov.io \
43-
"CodeCov report: https://codecov.io/github/anza-xyz/agave/commit/$CI_COMMIT"
35+
"CodeCov report: https://codecov.io/github/solana-labs/solana/commit/${CI_COMMIT:0:9}"
4436
fi

0 commit comments

Comments
 (0)