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

change royalties for brand #37

Merged
merged 14 commits into from
May 9, 2024
8 changes: 4 additions & 4 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ on:
permissions:
checks: write
pull-requests: write

jobs:
contracts:
name: Contracts
uses: multiversx/mx-sc-actions/.github/workflows/[email protected].1
uses: multiversx/mx-sc-actions/.github/workflows/[email protected].5
with:
rust-toolchain: nightly-2023-05-26
vmtools-version: v1.4.60
rust-toolchain: nightly-2023-12-11
vmtools-version: v1.5.24
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/on_pull_request_build_contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ permissions:

jobs:
build:
uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v2.3.1
uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v3.0.0
with:
image_tag: v5.3.0
image_tag: v6.1.2
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ permissions:

jobs:
build:
uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v2.3.1
uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v3.0.0
with:
image_tag: v5.3.0
image_tag: v6.1.2
attach_to_existing_release: true
skip_preliminary_checks: true
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,5 @@
# will have compiled files and executables
/target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock
!**/wasm*/Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk
12 changes: 0 additions & 12 deletions .vscode/launch.json

This file was deleted.

19 changes: 1 addition & 18 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
{
"terminal.integrated.env.linux": {
"PATH": "${env:HOME}/elrondsdk/vendor-rust/bin:${env:HOME}/elrondsdk/erdpy-venv/bin:${env:HOME}/elrondsdk/vmtools:${env:HOME}/elrondsdk/nodejs/latest/bin:${env:PATH}",
"VIRTUAL_ENV": "${env:HOME}/elrondsdk/erdpy-venv",
"RUSTUP_HOME": "${env:HOME}/elrondsdk/vendor-rust",
"CARGO_HOME": "${env:HOME}/elrondsdk/vendor-rust"
},
"terminal.integrated.env.osx": {
"PATH": "${env:HOME}/elrondsdk/vendor-rust/bin:${env:HOME}/elrondsdk/erdpy-venv/bin:${env:HOME}/elrondsdk/vmtools:${env:HOME}/elrondsdk/nodejs/latest/bin:${env:PATH}",
"VIRTUAL_ENV": "${env:HOME}/elrondsdk/erdpy-venv",
"RUSTUP_HOME": "${env:HOME}/elrondsdk/vendor-rust",
"CARGO_HOME": "${env:HOME}/elrondsdk/vendor-rust"
},
"terminal.integrated.environmentChangesIndicator": "on",
"terminal.integrated.inheritEnv": true,
"workbench.dialogs.customEnabled": true,
"rust-client.rustupPath": "${env:HOME}/elrondsdk/vendor-rust/bin/rustup",
"rust-client.rlsPath": "${env:HOME}/elrondsdk/vendor-rust/bin/rls",
"rust-client.disableRustup": true,
"rust-client.autoStartRls": false,
"rust-analyzer.linkedProjects": [
"./nft-minter-deployer/Cargo.toml"
]
}
}
14 changes: 0 additions & 14 deletions .vscode/tasks.json

This file was deleted.

Loading
Loading