Skip to content

Commit

Permalink
Merge branch 'main' into fix/default_limit
Browse files Browse the repository at this point in the history
  • Loading branch information
willemneal authored Nov 20, 2024
2 parents 4dab708 + 9853a77 commit f28e1f4
Show file tree
Hide file tree
Showing 26 changed files with 106 additions and 121 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,18 @@ jobs:
$Env:STELLAR_CLI_VERSION = "${{ env.VERSION }}"
ISCC.exe installer.iss
- name: Build provenance for attestation (release only)
if: github.event_name == 'release'
uses: actions/attest-build-provenance@v1
with:
subject-path: ${{ env.STELLAR_CLI_INSTALLER }}

- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: ${{ env.STELLAR_CLI_INSTALLER }}
path: Output/stellar-installer.exe

- name: Build provenance for attestation (release only)
if: github.event_name == 'release'
uses: actions/attest-build-provenance@v1
with:
subject-path: ${{ env.STELLAR_CLI_INSTALLER }}

- name: Upload to Release (release only)
if: github.event_name == 'release'
uses: actions/github-script@v7
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ changes quickly.

## Setting up development environment

There are 2 ways to being developing stellar-cli:
There are 2 ways to begin developing stellar-cli:

### Installing all required dependencies

Expand Down
32 changes: 16 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@ exclude = [
]

[workspace.package]
version = "22.0.0-rc.1"
version = "22.0.0"
rust-version = "1.81.0"

# Dependencies located in this repo:
[workspace.dependencies.soroban-cli]
version = "=22.0.0-rc.1"
version = "=22.0.0"
path = "cmd/soroban-cli"

[workspace.dependencies.soroban-spec-json]
version = "=22.0.0-rc.1"
version = "=22.0.0"
path = "./cmd/crates/soroban-spec-json"

[workspace.dependencies.soroban-spec-typescript]
version = "22.0.0-rc.1"
version = "22.0.0"
path = "./cmd/crates/soroban-spec-typescript"

[workspace.dependencies.soroban-spec-tools]
version = "22.0.0-rc.1"
version = "22.0.0"
path = "./cmd/crates/soroban-spec-tools"

# Dependencies from the rs-stellar-xdr repo:
Expand Down
1 change: 1 addition & 0 deletions cmd/crates/soroban-spec-typescript/ts-tests/initialize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function deploy_all() {
}
function bind() {
exe eval "./soroban contract bindings typescript --contract-id $(cat $1) --output-dir ./node_modules/$2 --overwrite"
exe eval "sh -c \"cd ./node_modules/$2 && npm install && npm run build\""
}
function bind_all() {
bind contract-id-custom-types.txt test-custom-types
Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-test"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
readme = "README.md"
version = "22.0.0-rc.1"
version.workspace = true
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "stellar-bye"
version = "22.0.0-rc.1"
version = "0.0.0"
edition = "2021"
publish = false

Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "soroban-hello"
version = "22.0.0-rc.1"
version = "0.0.0"
edition = "2021"
publish = false

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
[package]
name = "test_constructor"
version = "22.0.0-rc.1"
version = "0.0.0"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
edition = "2021"
publish = false
rust-version.workspace = true

[lib]
crate-type = ["cdylib"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
[package]
name = "test_custom_account"
version = "22.0.0-rc.1"
version = "0.0.0"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
edition = "2021"
publish = false
rust-version.workspace = true

[lib]
crate-type = ["cdylib"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
[package]
name = "test_custom_types"
version = "22.0.0-rc.1"
version = "0.0.0"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
edition = "2021"
publish = false
rust-version.workspace = true

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
[package]
name = "test_hello_world"
version = "22.0.0-rc.1"
version = "0.0.0"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
edition = "2021"
publish = false
rust-version.workspace = true

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
[package]
name = "test_swap"
version.workspace = true
version = "0.0.0"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
edition = "2021"
publish = false
rust-version.workspace = true

[lib]
crate-type = ["cdylib"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[package]
name = "test_token"
version.workspace = true
version = "0.0.0"
description = "Soroban standard token contract"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
edition = "2021"
publish = false
rust-version.workspace = true

[lib]
crate-type = ["cdylib"]
Expand Down
2 changes: 1 addition & 1 deletion cmd/soroban-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/stellar-cli"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
readme = "README.md"
version = "22.0.0-rc.1"
version.workspace = true
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down
Loading

0 comments on commit f28e1f4

Please sign in to comment.