Skip to content

Commit

Permalink
Add more release fixes (#585)
Browse files Browse the repository at this point in the history
  • Loading branch information
buffalu authored and jito-infra committed Feb 27, 2024
1 parent 0d32b4e commit d347812
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $ sudo dnf install openssl-devel systemd-devel pkg-config zlib-devel llvm clang
## **2. Download the source code.**

```bash
$ git clone https://github.com/solana-labs/solana.git
$ git clone https://github.com/jito-foundation/jito-solana.git
$ cd solana
```

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 @@ -289,7 +289,7 @@ if [[ -n $BUILDKITE_TAG ]]; then
start_pipeline "Tag pipeline for $BUILDKITE_TAG"

annotate --style info --context release-tag \
"https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"
"https://github.com/jito-foundation/jito-solana/releases/$BUILDKITE_TAG"

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

# Add helpful link back to the corresponding Github Pull Request
annotate --style info --context pr-backlink \
"Github Pull Request: https://github.com/solana-labs/solana/$BUILDKITE_BRANCH"
"Github Pull Request: https://github.com/jito-foundation/jito-solana/$BUILDKITE_BRANCH"

if [[ $GITHUB_USER = "dependabot[bot]" ]]; then
command_step dependabot "ci/dependabot-pr.sh" 5
Expand Down
4 changes: 2 additions & 2 deletions ci/buildkite-pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ if [[ -n $BUILDKITE_TAG ]]; then
start_pipeline "Tag pipeline for $BUILDKITE_TAG"

annotate --style info --context release-tag \
"https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"
"https://github.com/jito-foundation/jito-solana/releases/$BUILDKITE_TAG"

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

# Add helpful link back to the corresponding Github Pull Request
annotate --style info --context pr-backlink \
"Github Pull Request: https://github.com/solana-labs/solana/$BUILDKITE_BRANCH"
"Github Pull Request: https://github.com/jito-foundation/jito-solana/$BUILDKITE_BRANCH"

if [[ $GITHUB_USER = "dependabot[bot]" ]]; then
command_step dependabot "ci/dependabot-pr.sh" 5
Expand Down
4 changes: 2 additions & 2 deletions ci/buildkite-solana-private.sh
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ pull_or_push_steps() {
# start_pipeline "Tag pipeline for $BUILDKITE_TAG"

# annotate --style info --context release-tag \
# "https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"
# "https://github.com/jito-foundation/jito-solana/releases/$BUILDKITE_TAG"

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

# Add helpful link back to the corresponding Github Pull Request
annotate --style info --context pr-backlink \
"Github Pull Request: https://github.com/solana-labs/solana/$BUILDKITE_BRANCH"
"Github Pull Request: https://github.com/jito-foundation/jito-solana/$BUILDKITE_BRANCH"

if [[ $GITHUB_USER = "dependabot[bot]" ]]; then
command_step dependabot "ci/dependabot-pr.sh" 5
Expand Down
2 changes: 1 addition & 1 deletion ci/channel-info.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ here="$(dirname "$0")"
# shellcheck source=ci/semver_bash/semver.sh
source "$here"/semver_bash/semver.sh

remote=https://github.com/solana-labs/solana.git
remote=https://github.com/jito-foundation/jito-solana.git

# Fetch all vX.Y.Z tags
#
Expand Down
16 changes: 8 additions & 8 deletions docs/src/cli/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ on your preferred workflow:
- Open your favorite Terminal application

- Install the Solana release
[LATEST_SOLANA_RELEASE_VERSION](https://github.com/solana-labs/solana/releases/tag/LATEST_SOLANA_RELEASE_VERSION)
[LATEST_SOLANA_RELEASE_VERSION](https://github.com/jito-foundation/jito-solana/releases/tag/LATEST_SOLANA_RELEASE_VERSION)
on your machine by running:

```bash
sh -c "$(curl -sSfL https://release.solana.com/LATEST_SOLANA_RELEASE_VERSION/install)"
sh -c "$(curl -sSfL https://release.jito.wtf/LATEST_SOLANA_RELEASE_VERSION/install)"
```

- You can replace `LATEST_SOLANA_RELEASE_VERSION` with the release tag matching
Expand All @@ -38,7 +38,7 @@ downloading LATEST_SOLANA_RELEASE_VERSION installer
Configuration: /home/solana/.config/solana/install/config.yml
Active release directory: /home/solana/.local/share/solana/install/active_release
* Release version: LATEST_SOLANA_RELEASE_VERSION
* Release URL: https://github.com/solana-labs/solana/releases/download/LATEST_SOLANA_RELEASE_VERSION/solana-release-x86_64-unknown-linux-gnu.tar.bz2
* Release URL: https://github.com/jito-foundation/jito-solana/releases/download/LATEST_SOLANA_RELEASE_VERSION/solana-release-x86_64-unknown-linux-gnu.tar.bz2
Update successful
```

Expand Down Expand Up @@ -74,7 +74,7 @@ solana --version
installer into a temporary directory:

```bash
cmd /c "curl https://release.solana.com/LATEST_SOLANA_RELEASE_VERSION/solana-install-init-x86_64-pc-windows-msvc.exe --output C:\solana-install-tmp\solana-install-init.exe --create-dirs"
cmd /c "curl https://release.jito.wtf/LATEST_SOLANA_RELEASE_VERSION/solana-install-init-x86_64-pc-windows-msvc.exe --output C:\solana-install-tmp\solana-install-init.exe --create-dirs"
```

- Copy and paste the following command, then press Enter to install the latest
Expand Down Expand Up @@ -108,7 +108,7 @@ manually download and install the binaries.
### Linux

Download the binaries by navigating to
[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
[https://github.com/jito-foundation/jito-solana/releases/latest](https://github.com/jito-foundation/jito-solana/releases/latest),
download **solana-release-x86_64-unknown-linux-gnu.tar.bz2**, then extract the
archive:

Expand All @@ -121,7 +121,7 @@ export PATH=$PWD/bin:$PATH
### MacOS

Download the binaries by navigating to
[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
[https://github.com/jito-foundation/jito-solana/releases/latest](https://github.com/jito-foundation/jito-solana/releases/latest),
download **solana-release-x86_64-apple-darwin.tar.bz2**, then extract the
archive:

Expand All @@ -134,7 +134,7 @@ export PATH=$PWD/bin:$PATH
### Windows

- Download the binaries by navigating to
[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
[https://github.com/jito-foundation/jito-solana/releases/latest](https://github.com/jito-foundation/jito-solana/releases/latest),
download **solana-release-x86_64-pc-windows-msvc.tar.bz2**, then extract the
archive using WinZip or similar.

Expand Down Expand Up @@ -242,7 +242,7 @@ above.

After installing the prerequisites, proceed with building Solana from source,
navigate to
[Solana's GitHub releases page](https://github.com/solana-labs/solana/releases/latest),
[Solana's GitHub releases page](https://github.com/jito-foundation/jito-solana/releases/latest),
and download the **Source Code** archive. Extract the code and build the
binaries with:

Expand Down
2 changes: 1 addition & 1 deletion docs/src/clusters/benchmark.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The Solana git repository contains all the scripts you might need to spin up you

For all four variations, you'd need the latest Rust toolchain and the Solana source code:

First, setup Rust, Cargo and system packages as described in the Solana [README](https://github.com/solana-labs/solana#1-install-rustc-cargo-and-rustfmt)
First, setup Rust, Cargo and system packages as described in the Solana [README](https://github.com/jito-foundation/jito-solana#1-install-rustc-cargo-and-rustfmt)

Now checkout the code from github:

Expand Down
4 changes: 2 additions & 2 deletions install/solana-install-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
{ # this ensures the entire script is downloaded #

if [ -z "$SOLANA_DOWNLOAD_ROOT" ]; then
SOLANA_DOWNLOAD_ROOT="https://github.com/solana-labs/solana/releases/download/"
SOLANA_DOWNLOAD_ROOT="https://github.com/jito-foundation/jito-solana/releases/download/"
fi
GH_LATEST_RELEASE="https://api.github.com/repos/solana-labs/solana/releases/latest"
GH_LATEST_RELEASE="https://api.github.com/repos/jito-foundation/jito-solana/releases/latest"

set -e

Expand Down
4 changes: 2 additions & 2 deletions install/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -580,15 +580,15 @@ fn github_release_download_url(release_semver: &str) -> String {

fn release_channel_download_url(release_channel: &str) -> String {
format!(
"https://release.solana.com/{}/solana-release-{}.tar.bz2",
"https://release.jito.wtf/{}/solana-release-{}.tar.bz2",
release_channel,
crate::build_env::TARGET
)
}

fn release_channel_version_url(release_channel: &str) -> String {
format!(
"https://release.solana.com/{}/solana-release-{}.yml",
"https://release.jito.wtf/{}/solana-release-{}.yml",
release_channel,
crate::build_env::TARGET
)
Expand Down
4 changes: 2 additions & 2 deletions scripts/solana-install-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ esac

case $TAG in
edge|beta)
DOWNLOAD_URL=https://release.solana.com/"$TAG"/solana-release-$TARGET.tar.bz2
DOWNLOAD_URL=https://release.jito.wtf/"$TAG"/solana-release-$TARGET.tar.bz2
;;
*)
DOWNLOAD_URL=https://github.com/solana-labs/solana/releases/download/"$TAG"/solana-release-$TARGET.tar.bz2
DOWNLOAD_URL=https://github.com/jito-foundation/jito-solana/releases/download/"$TAG"/solana-release-$TARGET.tar.bz2
;;
esac

Expand Down

0 comments on commit d347812

Please sign in to comment.