Skip to content
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

Update for latest libraries #163

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
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 .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# paths = ["/path/to/override"] # path dependency overrides

[alias] # command aliases
install_soroban = "install --git https://github.com/AhaLabs/soroban-tools --rev c7fb7e08ba8efa9828d9df863d991558f269e35b --root ./target soroban-cli --debug"
install_stellar = "install --locked stellar-cli --version 21.0.0 --force --root ./target stellar-cli --debug"
Copy link
Member

Choose a reason for hiding this comment

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

We can probably pin to a major version with ^21 instead of pinning to a specific version.

I also don't think we need to set the root, or tell cargo to install with the dev profile with the debug flag.

Suggested change
install_stellar = "install --locked stellar-cli --version 21.0.0 --force --root ./target stellar-cli --debug"
install_stellar = "install --locked stellar-cli@^21 --force"

Copy link
Member

Choose a reason for hiding this comment

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

Ah ok I see the root is used to write the binary to a local directory then use it locally. Seems like an odd practice to encourage given it isn't encouraged in any other setup documentation though.

b = "build --target wasm32-unknown-unknown --release"
# c = "check"
# t = "test"
Expand Down
45 changes: 22 additions & 23 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,35 @@ on:
pull_request:

jobs:

complete:
if: always()
needs: [build-and-test]
runs-on: ubuntu-latest
steps:
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
run: exit 1
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
run: exit 1

build-and-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: stellar/actions/rust-cache@main
- run: rustup update
- run: rustup target add wasm32-unknown-unknown
- run: make build
- run: cargo install_soroban
- uses: actions/setup-node@v3
with:
node-version: 18.14.2
cache: 'npm'
- run: |
mkdir -p .soroban-example-dapp
echo 'futurenet' > .soroban-example-dapp/network
echo 'CAU23MVDEW7VMB3AXC5PL5GZO3HBYZPEIP2P46X4T3AIC4Y7FXYZWES5' > .soroban-example-dapp/abundance_token_id
echo 'CDJPYH5HNGZ24SEWXFJOW6RXXHHNKU4XPCPBMB2VRTDPTMVPLYFQKZIE' > .soroban-example-dapp/crowdfund_id
echo 'Test SDF Future Network ; October 2022' > .soroban-example-dapp/passphrase
echo 'https://rpc-futurenet.stellar.org/' > .soroban-example-dapp/rpc-url
echo '{"network":"futurenet","rpcUrl":"https://rpc-futurenet.stellar.org","networkPassphrase":"Test SDF Future Network ; October 2022"}' > shared/config.json
- uses: actions/checkout@v3
- uses: stellar/actions/rust-cache@main
- run: rustup update
- run: rustup target add wasm32-unknown-unknown
- run: make build
- run: cargo install_stellar
- uses: actions/setup-node@v3
with:
node-version: 18.20.3
cache: 'npm'
- run: |
mkdir -p .soroban-example-dapp
echo 'futurenet' > .soroban-example-dapp/network
echo 'CAU23MVDEW7VMB3AXC5PL5GZO3HBYZPEIP2P46X4T3AIC4Y7FXYZWES5' > .soroban-example-dapp/abundance_token_id
echo 'CDJPYH5HNGZ24SEWXFJOW6RXXHHNKU4XPCPBMB2VRTDPTMVPLYFQKZIE' > .soroban-example-dapp/crowdfund_id
echo 'Test SDF Future Network ; October 2022' > .soroban-example-dapp/passphrase
echo 'https://rpc-futurenet.stellar.org/' > .soroban-example-dapp/rpc-url
echo '{"network":"futurenet","rpcUrl":"https://rpc-futurenet.stellar.org","networkPassphrase":"Test SDF Future Network ; October 2022"}' > shared/config.json

- run: npm ci
- run: npm run build
- run: npm ci
- run: npm run build
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.14.2
18.20.3
Loading
Loading