Skip to content

[SOL] Update references to solana-labs redirecting them to anza-xyz #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -191,7 +191,7 @@ jobs:
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
AWS_REGION: us-west-1
CACHE_DOMAIN: ci-caches.rust-lang.org
if: "github.event_name == 'push' && startsWith(github.ref, 'refs/heads/solana-') && github.repository == 'solana-labs/rust'"
if: "github.event_name == 'push' && startsWith(github.ref, 'refs/heads/anza-') && github.repository == 'anza-xyz/rust'"
strategy:
matrix:
include:
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
shallow = true
[submodule "src/llvm-project"]
path = src/llvm-project
url = https://github.com/solana-labs/llvm-project.git
url = https://github.com/anza-xyz/llvm-project.git
branch = solana-rustc/17.0-2023-12-14
shallow = true
[submodule "src/doc/embedded-book"]
2 changes: 1 addition & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
@@ -723,7 +723,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
[[package]]
name = "compiler_builtins"
version = "0.1.103"
source = "git+https://github.com/solana-labs/compiler-builtins?tag=solana-tools-v1.40#81ef46f3fe1357095acdd089a700890fe4e13974"
source = "git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.40#81ef46f3fe1357095acdd089a700890fe4e13974"
dependencies = [
"cc",
"rustc-std-workspace-core",
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ miniz_oxide.debug = 0
object.debug = 0

[patch.crates-io]
compiler_builtins = { git = "https://github.com/solana-labs/compiler-builtins", tag = "solana-tools-v1.40" }
compiler_builtins = { git = "https://github.com/anza-xyz/compiler-builtins", tag = "solana-tools-v1.40" }
# See comments in `library/rustc-std-workspace-core/README.md` for what's going on
# here
rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

This fork of Rust contains changes that enable rustc to build BPF
modules. It depends on a customized
[fork](https://github.com/solana-labs/llvm-project) of Rust's LLVM
[fork](https://github.com/anza-xyz/llvm-project) of Rust's LLVM
fork.

Solana SDK does not depend directly on this repo. Instead [bpf-tools]
Solana SDK does not depend directly on this repo. Instead [platform-tools]
builds and releases binary packages that the Solana SDK pulls in.

[bpf-tools]: https://github.com/solana-labs/bpf-tools
[platform-tools]: https://github.com/anza-xyz/platform-tools

BPF modules are built using target triple `bpfel-unknown-unknown`
which represents the little endian version of BPF. There is no
@@ -40,8 +40,8 @@ After this repository is tagged for a new release, update the
version of the rust repository and make a new release tag in
[bpf-tools] repository.

[compiler-builtins]: https://github.com/solana-labs/compiler-builtins
[llvm-project]: https://github.com/solana-labs/llvm-project
[compiler-builtins]: https://github.com/anza-xyz/compiler-builtins
[llvm-project]: https://github.com/anza-xyz/llvm-project

---

2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ ENV RUSTUP_INIT_SKIP_PATH_CHECK="yes"
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

RUN PATH="${HOME}/.cargo/bin:${PATH}" \
cargo install --git https://github.com/solana-labs/cargo-run-solana-tests.git \
cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
--rev f7c1d109367c0ab4167d2eb41712777bcc66c9a4 \
--bin cargo-run-solana-tests --root /usr/local

2 changes: 1 addition & 1 deletion src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
@@ -367,7 +367,7 @@ jobs:
name: push
env:
<<: [*shared-ci-variables, *prod-variables]
if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/solana-') && github.repository == 'solana-labs/rust'
if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/anza-') && github.repository == 'anza-xyz/rust'
strategy:
matrix:
include:
2 changes: 1 addition & 1 deletion src/tools/tidy/src/extdeps.rs
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ use std::path::Path;

/// List of allowed sources for packages.
const ALLOWED_SOURCES: &[&str] = &["\"registry+https://github.com/rust-lang/crates.io-index\"",
"\"git+https://github.com/solana-labs/compiler-builtins?tag=solana-tools-v1.40#81ef46f3fe1357095acdd089a700890fe4e13974\""];
"\"git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.40#81ef46f3fe1357095acdd089a700890fe4e13974\""];

/// Checks for external package sources. `root` is the path to the directory that contains the
/// workspace `Cargo.toml`.