Skip to content

Commit 66a7566

Browse files
willhickeywen-coding
authored andcommitted
Revert "[anza migration] rename crates (solana-labs#10)"
This reverts commit 3f9a7a5.
1 parent 911be51 commit 66a7566

File tree

74 files changed

+8018
-13576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+8018
-13576
lines changed

.github/scripts/downstream-project-spl-common.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,23 @@
22
set -e
33

44
here="$(dirname "${BASH_SOURCE[0]}")"
5-
program="$1"
65

76
#shellcheck source=ci/downstream-projects/common.sh
87
source "$here"/../../ci/downstream-projects/common.sh
98

109
set -x
11-
rm -rf "${program}"
12-
git clone https://github.com/solana-program/"${program}".git
10+
rm -rf spl
11+
git clone https://github.com/solana-labs/solana-program-library.git spl
1312

1413
# copy toolchain file to use solana's rust version
15-
cp "$SOLANA_DIR"/rust-toolchain.toml "${program}"/
16-
cd "${program}" || exit 1
17-
echo "HEAD: $(git rev-parse HEAD)"
14+
cp "$SOLANA_DIR"/rust-toolchain.toml spl/
15+
cd spl || exit 1
1816

19-
project_used_solana_version=$(sed -nE 's/solana = \"(.*)\"/\1/p' <"Cargo.toml")
17+
project_used_solana_version=$(sed -nE 's/solana-sdk = \"[>=<~]*(.*)\"/\1/p' <"token/program/Cargo.toml")
2018
echo "used solana version: $project_used_solana_version"
2119
if semverGT "$project_used_solana_version" "$SOLANA_VER"; then
2220
echo "skip"
23-
export SKIP_SPL_DOWNSTREAM_PROJECT_TEST=1
2421
return
2522
fi
2623

27-
update_solana_dependencies . "$SOLANA_VER"
28-
patch_crates_io_solana Cargo.toml "$SOLANA_DIR"
24+
./patch.crates-io.sh "$SOLANA_DIR"

.github/workflows/publish-windows-tarball.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
mkdir -p "windows-release/$FOLDER_NAME"
6565
cp -v "solana-release-x86_64-pc-windows-msvc.tar.bz2" "windows-release/$FOLDER_NAME/"
6666
cp -v "solana-release-x86_64-pc-windows-msvc.yml" "windows-release/$FOLDER_NAME/"
67-
cp -v "agave-install-init-x86_64-pc-windows-msvc"* "windows-release/$FOLDER_NAME"
67+
cp -v "solana-install-init-x86_64-pc-windows-msvc"* "windows-release/$FOLDER_NAME"
6868
6969
- name: Upload Artifacts
7070
if: ${{ steps.build.outputs.channel != '' || steps.build.outputs.tag != '' }}

0 commit comments

Comments
 (0)