Skip to content

Commit c185f88

Browse files
authored
Fix things up for the new repo (#2)
* Fix things up for the new repo #### Problem CI is failing because paths are incorrect from the old repo. #### Summary of changes Fix up the paths. Also, add .gitignore since it's missing * Fix broken path * Add missing clippy config file
1 parent 610df6e commit c185f88

File tree

5 files changed

+42
-22
lines changed

5 files changed

+42
-22
lines changed

.clippy.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
too-many-arguments-threshold = 9
2+
3+
# Disallow specific methods from being used
4+
disallowed-methods = [
5+
{ path = "std::net::UdpSocket::bind", reason = "Use solana_net_utils::bind_with_config, bind_to, etc instead for proper socket configuration." },
6+
{ path = "tokio::net::UdpSocket::bind", reason = "Use solana_net_utils::bind_to_async or bind_to_with_config_non_blocking instead for proper socket configuration." },
7+
]

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ runs:
6161
- name: Set Environment Variables
6262
shell: bash
6363
run: |
64-
source ./sdk/scripts/rust-version.sh
64+
source ./scripts/rust-version.sh
6565
echo "RUST_STABLE=${rust_stable}" >> $GITHUB_ENV
6666
echo "RUST_NIGHTLY=${rust_nightly}" >> $GITHUB_ENV
6767

.github/workflows/main.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: SDK
1+
name: Main
22

33
on:
44
push:
@@ -23,13 +23,13 @@ jobs:
2323
cargo-cache-fallback-key: cargo-stable
2424

2525
- name: Check repo is in porcelain state
26-
run: ./sdk/scripts/check-porcelain.sh
26+
run: ./scripts/check-porcelain.sh
2727

2828
- name: Check code nits
29-
run: ./sdk/scripts/check-nits.sh
29+
run: ./scripts/check-nits.sh
3030

3131
- name: Run ShellCheck
32-
run: ./sdk/scripts/check-shell.sh
32+
run: ./scripts/check-shell.sh
3333

3434
check-crates:
3535
name: Check crate ownership
@@ -63,7 +63,7 @@ jobs:
6363
echo "COMMIT_RANGE=${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
6464
6565
- name: Check crate ownership
66-
run: ./sdk/scripts/check-crates.sh
66+
run: ./scripts/check-crates.sh
6767

6868
format:
6969
name: Format
@@ -81,7 +81,7 @@ jobs:
8181
cargo-cache-fallback-key: cargo-nightly
8282

8383
- name: Check formatting
84-
run: ./sdk/scripts/check-fmt.sh
84+
run: ./scripts/check-fmt.sh
8585

8686
check:
8787
name: Cargo check
@@ -99,7 +99,7 @@ jobs:
9999
cargo-cache-fallback-key: cargo-nightly
100100

101101
- name: Run checks
102-
run: ./sdk/scripts/check-nightly.sh
102+
run: ./scripts/check-nightly.sh
103103

104104
clippy:
105105
name: Clippy
@@ -134,7 +134,7 @@ jobs:
134134
echo "OPENSSL_INCLUDE_DIR=C:\OpenSSL\include" >> $GITHUB_ENV
135135
136136
- name: Run clippy
137-
run: ./sdk/scripts/check-clippy.sh
137+
run: ./scripts/check-clippy.sh
138138

139139
audit:
140140
name: Audit
@@ -156,7 +156,7 @@ jobs:
156156
tool: cargo-audit
157157

158158
- name: Run cargo-audit
159-
run: ./sdk/scripts/check-audit.sh
159+
run: ./scripts/check-audit.sh
160160

161161
semver:
162162
if: false # enable after 2.2.0 is cut
@@ -180,7 +180,7 @@ jobs:
180180
tool: cargo-semver-checks
181181

182182
- name: Run semver checks
183-
run: ./sdk/scripts/check-semver.sh
183+
run: ./scripts/check-semver.sh
184184

185185
hack:
186186
name: Cargo hack check
@@ -203,7 +203,7 @@ jobs:
203203
tool: cargo-hack
204204

205205
- name: Run hack check
206-
run: ./sdk/scripts/check-hack.sh
206+
run: ./scripts/check-hack.sh
207207

208208
check-crate-order-for-publishing:
209209
name: Check crate dependencies for publishing
@@ -214,7 +214,7 @@ jobs:
214214
uses: actions/checkout@v4
215215

216216
- name: Check crates for publishing
217-
run: ./sdk/scripts/order-crates-for-publishing.py
217+
run: ./scripts/order-crates-for-publishing.py
218218

219219
sort:
220220
name: Check sorting of crate dependencies
@@ -237,7 +237,7 @@ jobs:
237237
tool: cargo-sort
238238

239239
- name: Check toml ordering
240-
run: ./sdk/scripts/check-sort.sh
240+
run: ./scripts/check-sort.sh
241241

242242
check-dcou:
243243
name: Check declarations of `dev-context-only-utils` feature
@@ -255,7 +255,7 @@ jobs:
255255
cargo-cache-fallback-key: cargo-nightly
256256

257257
- name: Check dev-context-only-utils declarations
258-
run: ./sdk/scripts/check-dev-context-only-utils.sh
258+
run: ./scripts/check-dev-context-only-utils.sh
259259

260260
miri:
261261
name: Test miri
@@ -273,7 +273,7 @@ jobs:
273273
cargo-cache-fallback-key: cargo-nightly
274274

275275
- name: Run miri tests
276-
run: ./sdk/scripts/test-miri.sh
276+
run: ./scripts/test-miri.sh
277277

278278
frozen-abi:
279279
name: Run frozen-abi tests
@@ -291,7 +291,7 @@ jobs:
291291
cargo-cache-fallback-key: cargo-nightly
292292

293293
- name: Run frozen-abi tests
294-
run: ./sdk/scripts/test-frozen-abi.sh
294+
run: ./scripts/test-frozen-abi.sh
295295

296296
test-wasm:
297297
name: Build wasm packages and run tests
@@ -319,7 +319,7 @@ jobs:
319319
tool: wasm-pack
320320

321321
- name: Build and test wasm packages
322-
run: ./sdk/scripts/test-wasm.sh
322+
run: ./scripts/test-wasm.sh
323323

324324
test-coverage:
325325
name: Run coverage tests
@@ -342,7 +342,7 @@ jobs:
342342
tool: grcov
343343

344344
- name: Run coverage tests
345-
run: ./sdk/scripts/test-coverage.sh
345+
run: ./scripts/test-coverage.sh
346346

347347
test-stable:
348348
name: Run tests on stable toolchain
@@ -360,7 +360,7 @@ jobs:
360360
cargo-cache-fallback-key: cargo-stable
361361

362362
- name: Run tests
363-
run: ./sdk/scripts/test-stable.sh
363+
run: ./scripts/test-stable.sh
364364

365365
test-bench:
366366
name: Run benches
@@ -378,4 +378,4 @@ jobs:
378378
cargo-cache-fallback-key: cargo-nightly
379379

380380
- name: Run benches
381-
run: ./sdk/scripts/test-bench.sh
381+
run: ./scripts/test-bench.sh

.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
target/
2+
3+
**/*.rs.bk
4+
.cargo
5+
/config/
6+
.cache
7+
8+
# intellij files
9+
.idea/
10+
/solana.iml
11+
/.vscode/
12+
13+
.DS_Store

secp256k1-recover/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ libsecp256k1 = { workspace = true }
2828
[dev-dependencies]
2929
anyhow = { workspace = true }
3030
borsh = { workspace = true }
31-
solana-program = { path = "../../sdk/program" }
31+
solana-program = { path = "../program" }
3232

3333
[target.'cfg(not(target_os = "solana"))'.dev-dependencies]
3434
libsecp256k1 = { workspace = true, features = ["hmac"] }

0 commit comments

Comments
 (0)