Skip to content

Commit 15b736e

Browse files
committed
Merge branch 'main' into refactor/re-exporting-anchor
2 parents e486ab0 + 2420d0e commit 15b736e

Some content is hidden

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

64 files changed

+417
-154
lines changed

.github/workflows/publish-bolt-crates.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ jobs:
158158
run: |
159159
# Fails if versions are not aligned
160160
cargo install [email protected] --locked
161-
./version-align.sh --check
161+
./scripts/version-align.sh --check
162162
163163
- name: run build
164164
run: |
165165
export PATH="/home/runner/.local/share/solana/install/active_release/bin:$PATH"
166-
cargo install --path cli --force --locked
166+
cargo install --path crates/bolt-cli --force --locked
167167
bolt build
168168
169169
- name: Generate lib
@@ -175,7 +175,7 @@ jobs:
175175
- name: run tests
176176
run: |
177177
export PATH="/home/runner/.local/share/solana/install/active_release/bin:$PATH"
178-
cargo install --path cli --force --locked
178+
cargo install --path crates/bolt-cli --force --locked
179179
bolt test
180180
181181
- name: cargo publish
@@ -201,12 +201,12 @@ jobs:
201201
cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/delegate/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
202202
cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-helpers/attribute/system-template/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
203203
cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-helpers/attribute/world-apply/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
204-
cargo publish $DRY_RUN_FLAG --manifest-path=programs/bolt-system/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
205-
cargo publish $DRY_RUN_FLAG --manifest-path=programs/bolt-component/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
206-
cargo publish $DRY_RUN_FLAG --manifest-path=programs/world/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
204+
cargo publish $DRY_RUN_FLAG --manifest-path=crates/programs/bolt-system/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
205+
cargo publish $DRY_RUN_FLAG --manifest-path=crates/programs/bolt-component/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
206+
cargo publish $DRY_RUN_FLAG --manifest-path=crates/programs/world/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
207207
cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG
208208
if [ "${DRY_RUN}" != "true" ]; then
209-
cargo publish --manifest-path=cli/Cargo.toml --token $CRATES_TOKEN
209+
cargo publish --manifest-path=crates/bolt-cli/Cargo.toml --token $CRATES_TOKEN
210210
fi
211211
env:
212212
CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }}

.github/workflows/publish-bolt-sdk.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ jobs:
158158
run: |
159159
# Fails if versions are not aligned
160160
cargo install [email protected] --locked
161-
./version-align.sh --check
161+
./scripts/version-align.sh --check
162162
163163
- name: run build
164164
run: |
165165
export PATH="/home/runner/.local/share/solana/install/active_release/bin:$PATH"
166-
cargo install --path cli --force --locked
166+
cargo install --path crates/bolt-cli --force --locked
167167
bolt build
168168
169169
- name: Generate lib
@@ -175,7 +175,7 @@ jobs:
175175
- name: run tests
176176
run: |
177177
export PATH="/home/runner/.local/share/solana/install/active_release/bin:$PATH"
178-
cargo install --path cli --force --locked
178+
cargo install --path crates/bolt-cli --force --locked
179179
bolt test
180180
181181
- name: npm publish

.github/workflows/publish-packages.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,20 @@ jobs:
9797
with:
9898
use-cross: true
9999
command: build
100-
args: --manifest-path=cli/Cargo.toml --release --locked --target ${{ matrix.build.TARGET }}
100+
args: --manifest-path=crates/bolt-cli/Cargo.toml --release --locked --target ${{ matrix.build.TARGET }}
101101

102102
- name: Build (windows)
103103
if: matrix.build.OS == 'windows-latest'
104104
uses: actions-rs/cargo@v1
105105
with:
106106
command: build
107-
args: --manifest-path=cli/Cargo.toml --no-default-features --release --locked --target ${{ matrix.build.TARGET }}
107+
args: --manifest-path=crates/bolt-cli/Cargo.toml --no-default-features --release --locked --target ${{ matrix.build.TARGET }}
108108

109109
- name: Check versions are aligned
110110
run: |
111111
# Fails if versions are not aligned
112112
cargo install [email protected] --locked
113-
./version-align.sh --check
113+
./scripts/version-align.sh --check
114114
115115
- name: Build the NPM package
116116
shell: bash
@@ -136,7 +136,7 @@ jobs:
136136
# create the package directory
137137
mkdir -p "${node_pkg}/bin"
138138
# generate package.json from the template
139-
envsubst < cli/npm-package/package.json.tmpl > "${node_pkg}/package.json"
139+
envsubst < crates/bolt-cli/npm-package/package.json.tmpl > "${node_pkg}/package.json"
140140
cat "${node_pkg}/package.json"
141141
# copy the binary into the package
142142
# note: windows binaries has '.exe' extension

.github/workflows/run-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
8989
- name: Run Build and Tests
9090
run: |
91-
cargo install --path cli --force --locked
91+
cargo install --path crates/bolt-cli --force --locked
9292
yarn install
9393
bolt build
9494
cd clients/bolt-sdk

Anchor.toml

+10-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,16 @@ cluster = "Localnet"
2424
wallet = "./tests/fixtures/provider.json"
2525

2626
[workspace]
27-
members = ["programs/bolt-component", "programs/bolt-system", "programs/world", "examples/component-position", "examples/component-velocity", "examples/system-apply-velocity", "examples/system-fly", "examples/system-simple-movement"]
27+
members = [
28+
"crates/programs/bolt-component",
29+
"crates/programs/bolt-system",
30+
"crates/programs/world",
31+
"examples/component-position",
32+
"examples/component-velocity",
33+
"examples/system-apply-velocity",
34+
"examples/system-fly",
35+
"examples/system-simple-movement"
36+
]
2837

2938
[scripts]
3039
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/bolt.ts"

0 commit comments

Comments
 (0)