Skip to content

Commit

Permalink
Update CI (#584)
Browse files Browse the repository at this point in the history
- Add recursive submodule checkouts.
- Re-add solana-secondary step
  • Loading branch information
buffalu authored Jan 31, 2024
1 parent 47081d6 commit a3925b8
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 44 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'

- uses: mozilla-actions/[email protected]
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/changelog-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: 'recursive'
- name: Check if changes to CHANGELOG.md
shell: bash
env:
Expand Down
4 changes: 2 additions & 2 deletions ci/buildkite-pipeline-in-disk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ if [[ -n $BUILDKITE_TAG ]]; then
"https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"

# Jump directly to the secondary build to publish release artifacts quickly
# trigger_secondary_step
trigger_secondary_step
exit 0
fi

Expand Down Expand Up @@ -320,5 +320,5 @@ fi
start_pipeline "Push pipeline for ${BUILDKITE_BRANCH:-?unknown branch?}"
pull_or_push_steps
wait_step
#trigger_secondary_step
trigger_secondary_step
exit 0
6 changes: 3 additions & 3 deletions ci/buildkite-pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ wait_step() {
all_test_steps() {
command_step checks1 ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-checks.sh" 20 check
command_step checks2 ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-dev-context-only-utils.sh check-bins" 15 check
command_step checks3 ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-dev-context-only-utils.sh check-all-targets" 20 check
command_step checks3 ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-dev-context-only-utils.sh check-all-targets" 15 check
wait_step

# Full test suite
Expand Down Expand Up @@ -318,7 +318,7 @@ if [[ -n $BUILDKITE_TAG ]]; then
"https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"

# Jump directly to the secondary build to publish release artifacts quickly
# trigger_secondary_step
trigger_secondary_step
exit 0
fi

Expand Down Expand Up @@ -346,5 +346,5 @@ fi
start_pipeline "Push pipeline for ${BUILDKITE_BRANCH:-?unknown branch?}"
pull_or_push_steps
wait_step
#trigger_secondary_step
trigger_secondary_step
exit 0
62 changes: 31 additions & 31 deletions ci/buildkite-secondary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,34 @@ steps:
agents:
queue: "release-build"
timeout_in_minutes: 5
- wait
- name: "publish docker"
command: "sdk/docker-solana/build.sh"
agents:
queue: "release-build"
timeout_in_minutes: 60
- name: "publish crate"
command: "ci/publish-crate.sh"
agents:
queue: "release-build"
retry:
manual:
permit_on_passed: true
timeout_in_minutes: 240
branches: "!master"
- name: "publish tarball (aarch64-apple-darwin)"
command: "ci/publish-tarball.sh"
agents:
queue: "release-build-aarch64-apple-darwin"
retry:
manual:
permit_on_passed: true
timeout_in_minutes: 60
- name: "publish tarball (x86_64-apple-darwin)"
command: "ci/publish-tarball.sh"
agents:
queue: "release-build-x86_64-apple-darwin"
retry:
manual:
permit_on_passed: true
timeout_in_minutes: 60
# - wait
# - name: "publish docker"
# command: "sdk/docker-solana/build.sh"
# agents:
# queue: "release-build"
# timeout_in_minutes: 60
# - name: "publish crate"
# command: "ci/publish-crate.sh"
# agents:
# queue: "release-build"
# retry:
# manual:
# permit_on_passed: true
# timeout_in_minutes: 240
# branches: "!master"
# - name: "publish tarball (aarch64-apple-darwin)"
# command: "ci/publish-tarball.sh"
# agents:
# queue: "release-build-aarch64-apple-darwin"
# retry:
# manual:
# permit_on_passed: true
# timeout_in_minutes: 60
# - name: "publish tarball (x86_64-apple-darwin)"
# command: "ci/publish-tarball.sh"
# agents:
# queue: "release-build-x86_64-apple-darwin"
# retry:
# manual:
# permit_on_passed: true
# timeout_in_minutes: 60
10 changes: 5 additions & 5 deletions ci/publish-installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ fi
# upload install script
source ci/upload-ci-artifact.sh

cat >release.solana.com-install <<EOF
cat >release.jito.wtf-install <<EOF
SOLANA_RELEASE=$CHANNEL_OR_TAG
SOLANA_INSTALL_INIT_ARGS=$CHANNEL_OR_TAG
SOLANA_DOWNLOAD_ROOT=https://release.solana.com
SOLANA_DOWNLOAD_ROOT=https://release.jito.wtf
EOF
cat install/solana-install-init.sh >>release.solana.com-install
cat install/solana-install-init.sh >>release.jito.wtf-install

echo --- AWS S3 Store: "install"
upload-s3-artifact "/solana/release.solana.com-install" "s3://release.solana.com/$CHANNEL_OR_TAG/install"
upload-s3-artifact "/solana/release.jito.wtf-install" "s3://release.jito.wtf/$CHANNEL_OR_TAG/install"
echo Published to:
ci/format-url.sh https://release.solana.com/"$CHANNEL_OR_TAG"/install
ci/format-url.sh https://release.jito.wtf/"$CHANNEL_OR_TAG"/install
6 changes: 3 additions & 3 deletions ci/publish-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,16 @@ for file in "${TARBALL_BASENAME}"-$TARGET.tar.bz2 "${TARBALL_BASENAME}"-$TARGET.

if [[ -n $BUILDKITE ]]; then
echo --- AWS S3 Store: "$file"
upload-s3-artifact "/solana/$file" s3://release.solana.com/"$CHANNEL_OR_TAG"/"$file"
upload-s3-artifact "/solana/$file" s3://release.jito.wtf/"$CHANNEL_OR_TAG"/"$file"

echo Published to:
$DRYRUN ci/format-url.sh https://release.solana.com/"$CHANNEL_OR_TAG"/"$file"
$DRYRUN ci/format-url.sh https://release.jito.wtf/"$CHANNEL_OR_TAG"/"$file"

if [[ -n $TAG ]]; then
ci/upload-github-release-asset.sh "$file"
fi
elif [[ -n $TRAVIS ]]; then
# .travis.yml uploads everything in the travis-s3-upload/ directory to release.solana.com
# .travis.yml uploads everything in the travis-s3-upload/ directory to release.jito.wtf
mkdir -p travis-s3-upload/"$CHANNEL_OR_TAG"
cp -v "$file" travis-s3-upload/"$CHANNEL_OR_TAG"/

Expand Down

0 comments on commit a3925b8

Please sign in to comment.