Skip to content

Commit

Permalink
Merge pull request #2024 from radixdlt/main
Browse files Browse the repository at this point in the history 
Merge main into develop
  • Loading branch information
@iamyulong
iamyulong authored Nov 26, 2024
2 parents 5ce7672 + 030f631 commit f403fac
Show file tree
Hide file tree
Showing 207 changed files with 7,273 additions and 4,189 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/dispatch-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ permissions: write-all

jobs:
dispatch-release:
environment: release
runs-on: ubuntu-latest
steps:
- uses: RDXWorks-actions/checkout@main
Expand All @@ -36,13 +37,11 @@ jobs:
git add .
git commit -m "Update version to ${VERSION_NUMBER:1}"
echo "Testing to release all updated cargo crates"
./test-cargo-crates-release.sh
git push
# gh release create ${VERSION_NUMBER} --notes "Release from dispatch" --prerelease
git tag ${VERSION_NUMBER}
git push --tags
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION_NUMBER: ${{ inputs.release-tag }}
VERSION_NUMBER: ${{ inputs.release-tag }}
CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }}
30 changes: 1 addition & 29 deletions .github/workflows/publish-cargo-crates.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,43 +17,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: RDXWorks-actions/checkout@main
- uses: radixdlt/iac-resuable-artifacts/fetch-secrets@v0.8.0
- uses: radixdlt/public-iac-resuable-artifacts/fetch-secrets@main
with:
role_name: "arn:aws:iam::308190735829:role/gh-common-secrets-read-access"
app_name: "radixdlt-scrypto"
step_name: "publish-crate"
secret_prefix: "CRATES"
secret_name: "arn:aws:secretsmanager:eu-west-2:308190735829:secret:github-actions/common/cratesio-token-IjOP4n"
parse_json: true
- name: Dry Run Publish crates
if: github.event.release.prerelease
run: |
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-rust/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./sbor-derive-common/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./sbor-derive/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./sbor/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-sbor-derive/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-common/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-common-derive/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-blueprint-schema-init/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-engine-interface/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./scrypto-derive/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./scrypto/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-substate-store-interface/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-substate-store-impls/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-engine-profiling/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-engine-profiling-derive/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-native-sdk/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-transactions/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-engine/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-transaction-scenarios/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-substate-store-queries/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./scrypto-bindgen/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./scrypto-compiler/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./scrypto-test/Cargo.toml"
cargo publish --dry-run --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-clis/Cargo.toml"
- name: Publish crates
if: github.event.release.prerelease == false
run: |
cargo publish --token "${{ env.CRATES_TOKEN }}" --manifest-path "./radix-rust/Cargo.toml"
cargo publish --token "${{ env.CRATES_TOKEN }}" --manifest-path "./sbor-derive-common/Cargo.toml"
Expand Down
58 changes: 29 additions & 29 deletions Cargo.lock
View file

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

48 changes: 24 additions & 24 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,30 @@ members = [
]

[workspace.dependencies]
radix-blueprint-schema-init = { version = "1.3.0-dev", path = "./radix-blueprint-schema-init", default-features = false }
radix-common = { version = "1.3.0-dev", path = "./radix-common", default-features = false }
radix-common-derive = { version = "1.3.0-dev", path = "./radix-common-derive", default-features = false }
radix-engine = { version = "1.3.0-dev", path = "./radix-engine", default-features = false }
radix-engine-toolkit-common = { version = "1.3.0-dev", path = "./radix-engine-toolkit-common", default-features = false }
radix-engine-interface = { version = "1.3.0-dev", path = "./radix-engine-interface", default-features = false }
radix-engine-profiling = { version = "1.3.0-dev", path = "./radix-engine-profiling", default-features = false }
radix-engine-profiling-derive = { version = "1.3.0-dev", path = "./radix-engine-profiling-derive", default-features = false }
radix-native-sdk = { version = "1.3.0-dev", path = "./radix-native-sdk", default-features = false }
radix-rust = { version = "1.3.0-dev", path = "./radix-rust", default-features = false }
radix-sbor-derive = { version = "1.3.0-dev", path = "./radix-sbor-derive", default-features = false }
radix-substate-store-impls = { version = "1.3.0-dev", path = "./radix-substate-store-impls", default-features = false }
radix-substate-store-interface = { version = "1.3.0-dev", path = "./radix-substate-store-interface", default-features = false }
radix-substate-store-queries = { version = "1.3.0-dev", path = "./radix-substate-store-queries", default-features = false }
radix-transaction-scenarios = { version = "1.3.0-dev", path = "./radix-transaction-scenarios", default-features = false }
radix-transactions = { version = "1.3.0-dev", path = "./radix-transactions", default-features = false }
sbor = { version = "1.3.0-dev", path = "./sbor", default-features = false }
sbor-derive = { version = "1.3.0-dev", path = "./sbor-derive", default-features = false }
sbor-derive-common = { version = "1.3.0-dev", path = "./sbor-derive-common", default-features = false }
scrypto = { version = "1.3.0-dev", path = "./scrypto", default-features = false }
scrypto-bindgen = { version = "1.3.0-dev", path = "./scrypto-bindgen", default-features = false }
scrypto-compiler = { version = "1.3.0-dev", path = "./scrypto-compiler", default-features = false }
scrypto-derive = { version = "1.3.0-dev", path = "./scrypto-derive", default-features = false }
scrypto-test = { version = "1.3.0-dev", path = "./scrypto-test", default-features = false }
radix-blueprint-schema-init = { version = "1.3.0-rc.2", path = "./radix-blueprint-schema-init", default-features = false }
radix-common = { version = "1.3.0-rc.2", path = "./radix-common", default-features = false }
radix-common-derive = { version = "1.3.0-rc.2", path = "./radix-common-derive", default-features = false }
radix-engine = { version = "1.3.0-rc.2", path = "./radix-engine", default-features = false }
radix-engine-toolkit-common = { version = "1.3.0-rc.2", path = "./radix-engine-toolkit-common", default-features = false }
radix-engine-interface = { version = "1.3.0-rc.2", path = "./radix-engine-interface", default-features = false }
radix-engine-profiling = { version = "1.3.0-rc.2", path = "./radix-engine-profiling", default-features = false }
radix-engine-profiling-derive = { version = "1.3.0-rc.2", path = "./radix-engine-profiling-derive", default-features = false }
radix-native-sdk = { version = "1.3.0-rc.2", path = "./radix-native-sdk", default-features = false }
radix-rust = { version = "1.3.0-rc.2", path = "./radix-rust", default-features = false }
radix-sbor-derive = { version = "1.3.0-rc.2", path = "./radix-sbor-derive", default-features = false }
radix-substate-store-impls = { version = "1.3.0-rc.2", path = "./radix-substate-store-impls", default-features = false }
radix-substate-store-interface = { version = "1.3.0-rc.2", path = "./radix-substate-store-interface", default-features = false }
radix-substate-store-queries = { version = "1.3.0-rc.2", path = "./radix-substate-store-queries", default-features = false }
radix-transaction-scenarios = { version = "1.3.0-rc.2", path = "./radix-transaction-scenarios", default-features = false }
radix-transactions = { version = "1.3.0-rc.2", path = "./radix-transactions", default-features = false }
sbor = { version = "1.3.0-rc.2", path = "./sbor", default-features = false }
sbor-derive = { version = "1.3.0-rc.2", path = "./sbor-derive", default-features = false }
sbor-derive-common = { version = "1.3.0-rc.2", path = "./sbor-derive-common", default-features = false }
scrypto = { version = "1.3.0-rc.2", path = "./scrypto", default-features = false }
scrypto-bindgen = { version = "1.3.0-rc.2", path = "./scrypto-bindgen", default-features = false }
scrypto-compiler = { version = "1.3.0-rc.2", path = "./scrypto-compiler", default-features = false }
scrypto-derive = { version = "1.3.0-rc.2", path = "./scrypto-derive", default-features = false }
scrypto-test = { version = "1.3.0-rc.2", path = "./scrypto-test", default-features = false }

arbitrary = { version = "1.3.0", features = ["derive"] }
bech32 = { version = "0.9.0", default-features = false }
Expand Down
Loading

0 comments on commit f403fac

Please sign in to comment.