Skip to content

move sdk crates to sdk dir#3498

Merged
joncinque merged 2 commits intoanza-xyz:masterfrom
kevinheavey:move-sdk-crates
Nov 6, 2024
Merged

move sdk crates to sdk dir#3498
joncinque merged 2 commits intoanza-xyz:masterfrom
kevinheavey:move-sdk-crates

Conversation

@kevinheavey
Copy link
Copy Markdown

Problem

There are some crates that solana-sdk depends on that do not live in the sdk/ directory. The SDK crates will get moved to a new repo at some point and we don't want these to get missed

Summary of Changes

Move them

@kevinheavey
Copy link
Copy Markdown
Author

kevinheavey commented Nov 6, 2024

CI failure

error: failed to select a version for the requirement `solana-logger = "^2.2.0"`
candidate versions found which didn't match: 2.1.0, 2.0.14, 2.0.13, ...
location searched: crates.io index
required by package `spl-feature-proposal-cli v1.2.0 (/home/runner/work/agave/agave/target/downstream-projects/spl/feature-proposal/cli)`

@joncinque
Copy link
Copy Markdown

joncinque commented Nov 6, 2024

The change looks good to me! Can you disable the downstream SPL jobs with a few if: false lines for check / test-sbf / test at

? They're failing because of the paths hardcoded at https://github.com/solana-labs/solana-program-library/blob/master/patch.crates-io.sh -- once this lands, I'll fix SPL and then re-enable the downstream job.

joncinque
joncinque previously approved these changes Nov 6, 2024
Copy link
Copy Markdown

@joncinque joncinque left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@kevinheavey kevinheavey added the automerge automerge Merge this Pull Request automatically once CI passes label Nov 6, 2024
@anza-team anza-team removed the automerge automerge Merge this Pull Request automatically once CI passes label Nov 6, 2024
@anza-team
Copy link
Copy Markdown
Collaborator

😱 New commits were pushed while the automerge label was present.

@kevinheavey
Copy link
Copy Markdown
Author

Had to fix conflicts

@kevinheavey kevinheavey added the automerge automerge Merge this Pull Request automatically once CI passes label Nov 6, 2024
@kevinheavey
Copy link
Copy Markdown
Author

@joncinque could you merge? Looks like automerge isn't firing

@joncinque joncinque merged commit adca5f7 into anza-xyz:master Nov 6, 2024
joncinque added a commit to joncinque/solana-program-library that referenced this pull request Nov 6, 2024
#### Problem

The locations of crates in the monorepo was moved to the `sdk/` dir in
anza-xyz/agave#3498, but the patch script is
still looking in the wrong location. This is why the downstream job was
disabled in that PR.

#### Summary of changes

Get the patch script up to date with the new locations of the crates.
joncinque added a commit to solana-labs/solana-program-library that referenced this pull request Nov 6, 2024
#### Problem

The locations of crates in the monorepo was moved to the `sdk/` dir in
anza-xyz/agave#3498, but the patch script is
still looking in the wrong location. This is why the downstream job was
disabled in that PR.

#### Summary of changes

Get the patch script up to date with the new locations of the crates.
joncinque added a commit that referenced this pull request Nov 7, 2024
* CI: Re-enable downstream SPL job

#### Problem

The downstream SPL job was disabled in #3498 because the moved crates
weren't correctly picked up in the SPL's patch script. The SPL patch
script was fixed in
solana-labs/solana-program-library#7465, but the
jobs are still disabled.

#### Summary of changes

Re-enable the SPL downstream jobs.

* Restrict which repo runs the job
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge automerge Merge this Pull Request automatically once CI passes need:merge-assist

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants