Skip to content

Commit

Permalink
Merge branch 'master' into release-0.24.2
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/dfx/assets/dfx-asset-sources.toml
  • Loading branch information
Jason I committed Oct 23, 2024
2 parents b935a74 + 584cd61 commit 4eea5c8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ This should lead to significantly faster upload times for frontends with many sm

## Dependencies

### Motoko

Updated Motoko to [0.13.2](https://github.com/dfinity/motoko/releases/tag/0.13.2)

### Frontend canister

`SetAssetContentArguments` has a new field `last_chunk: opt blob` which can be used in addition to `chunk_ids` so that small assets can be uploaded as part of `commit_batch`,
Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,23 +130,23 @@
"builtin": false,
"description": "The Motoko base library",
"owner": "dfinity",
"sha256": "096icqgg2ab713zjxw8v5kn30ickp0av632j38ympwll7rb3rjl5",
"sha256": "0qq8dlzjy4dkp5jn2ly21aw8n024fmkvhisca2qswhsqbg2wwv3x",
"type": "tarball",
"url": "https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-base-library.tar.gz",
"url_template": "https://github.com/dfinity/motoko/releases/download/<version>/motoko-base-library.tar.gz",
"version": "0.13.2"
},
"motoko-x86_64-darwin": {
"builtin": false,
"sha256": "1gz7k5xnq7cifdvsbpi5ymfcfn61wk6av4xidal1w23xx0q90m4q",
"sha256": "1pb5jn7nr5s18hqpcvzc4szkdnrk2h417d6dpwnrrx8l3fqvx1m3",
"type": "file",
"url": "https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-Darwin-x86_64-0.13.2.tar.gz",
"url_template": "https://github.com/dfinity/motoko/releases/download/<version>/motoko-Darwin-x86_64-<version>.tar.gz",
"version": "0.13.2"
},
"motoko-x86_64-linux": {
"builtin": false,
"sha256": "0yi6vxin5hyrzp3av66rzs4058d90dbjzi5kp0yi3xr4jki9rjb9",
"sha256": "1i1adh7a5yn10a8k1sjnl8bp8k2sxfmmy5smy2phj28lzwm374j9",
"type": "file",
"url": "https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-Linux-x86_64-0.13.2.tar.gz",
"url_template": "https://github.com/dfinity/motoko/releases/download/<version>/motoko-Linux-x86_64-<version>.tar.gz",
Expand Down
8 changes: 4 additions & 4 deletions src/dfx/assets/dfx-asset-sources.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sha256 = '156ace51ba5ae2dada64f2dc4d57ff917c437a06c3a7523f9d002e5e5e1039f0'

[x86_64-darwin.motoko]
url = 'https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-Darwin-x86_64-0.13.2.tar.gz'
sha256 = '98549030e87d081ea86ab193adcce4c158c75cf525dea57773911d6c7b99e7bf'
sha256 = 'a386beb11b14f59c2dbfcdb413081433db36bf26ec6f76314441976c8f9565dd'
# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.

[x86_64-darwin.replica]
Expand Down Expand Up @@ -54,7 +54,7 @@ sha256 = '89a3ee5796d9fab8b07596e527d4f30d1326010ea4bd8ee9e0ec71f82e027c79'

[x86_64-darwin.motoko-base]
url = 'https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-base-library.tar.gz'
sha256 = '810edcae82dc1255edbf5dbd779aa7dbeb0ad79463be9fb502a23b7f13792f27'
sha256 = 'd456d015745af15ce8ee731ce184163b8f2385a1ba45741393da667f08a376db'

[x86_64-darwin.ic-btc-canister]
url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2023-10-13/ic-btc-canister.wasm.gz'
Expand Down Expand Up @@ -82,7 +82,7 @@ sha256 = '3ab0ed26ecfb43e7cc891dd8a27b20085269de5948f804a51e5235c6a4da0bbc'

[x86_64-linux.motoko]
url = 'https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-Linux-x86_64-0.13.2.tar.gz'
sha256 = '69c99ce29424f7113db8b3c42f5703a9a10288fed998adc6fdd9c36263df267a'
sha256 = '4992332aff140909aff055175fabeb5a4c7417a256ea309102c1faa20e6c2ac4'
# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.

[x86_64-linux.replica]
Expand Down Expand Up @@ -113,7 +113,7 @@ sha256 = '9ba9c4a46c07d6c859a8e5e6f015a295c59d67bc5dd334024ce541edf706ba28'

[x86_64-linux.motoko-base]
url = 'https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-base-library.tar.gz'
sha256 = '810edcae82dc1255edbf5dbd779aa7dbeb0ad79463be9fb502a23b7f13792f27'
sha256 = 'd456d015745af15ce8ee731ce184163b8f2385a1ba45741393da667f08a376db'

[x86_64-linux.ic-btc-canister]
url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2023-10-13/ic-btc-canister.wasm.gz'
Expand Down

0 comments on commit 4eea5c8

Please sign in to comment.