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.

Sign up for GitHub

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

chore: remove ic-ref from the binary cache #3493

Merged
merged 3 commits into from
Jan 8, 2024
Merged

chore: remove ic-ref from the binary cache #3493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62f2821
chore: remove ic-ref from the binary cache
ericswanson-dfinity Jan 8, 2024
694e643
clippy
ericswanson-dfinity Jan 8, 2024
e9ab952
Merge branch 'master' into ens-remove-ic-ref
ericswanson-dfinity Jan 8, 2024
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

The `dfx cycles` command no longer needs nor accepts the `--cycles-ledger-canister-id <canister id>` parameter.

### chore: removed ic-ref from the binary cache

# 0.15.3

### fix: allow `http://localhost:*` as `connect-src` in the asset canister's CSP
Expand Down
18 changes: 0 additions & 18 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,24 +106,6 @@
"url": "https://download.dfinity.systems/ic/69e1408347723dbaa7a6cd2faa9b65c42abbe861/openssl-static-binaries/x86_64-linux/ic-nns-init.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/openssl-static-binaries/x86_64-linux/ic-nns-init.gz"
},
"ic-ref-x86_64-darwin": {
"builtin": false,
"rev": "3cc51be58784ba9b6e9a06afb4b59a11fb31c771",
"sha256": "03w92npwpvsrlh4icnq1cpz9dc54wpbqfqvzm1558vglg52nkhg1",
"type": "file",
"url": "https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-a9f73dba-x86_64-darwin.tar.gz",
"url_template": "https://download.dfinity.systems/ic-ref/ic-ref-<version>-x86_64-darwin.tar.gz",
"version": "0.0.1-a9f73dba"
},
"ic-ref-x86_64-linux": {
"builtin": false,
"rev": "3cc51be58784ba9b6e9a06afb4b59a11fb31c771",
"sha256": "1962cb5kyx92ysi6pn81rl48zd1k4r12gc0xbfab5lc79rv6fjaw",
"type": "file",
"url": "https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-a9f73dba-x86_64-linux.tar.gz",
"url_template": "https://download.dfinity.systems/ic-ref/ic-ref-<version>-x86_64-linux.tar.gz",
"version": "0.0.1-a9f73dba"
},
"ic-starter-x86_64-darwin": {
"builtin": false,
"rev": "69e1408347723dbaa7a6cd2faa9b65c42abbe861",
Expand Down
19 changes: 0 additions & 19 deletions scripts/update-ic-ref.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/write-dfx-asset-sources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ write_replica_rev
motoko_base_sha="$(calculate_sha256 "motoko-base")"
for platform in "darwin" "linux";
do
for name in "ic-ref" "icx-proxy" "ic-admin" "ic-btc-adapter" "ic-https-outcalls-adapter" "ic-nns-init" "ic-starter" "motoko" "replica" "canister_sandbox" "sandbox_launcher" "sns";
for name in "icx-proxy" "ic-admin" "ic-btc-adapter" "ic-https-outcalls-adapter" "ic-nns-init" "ic-starter" "motoko" "replica" "canister_sandbox" "sandbox_launcher" "sns";
do
if [[ "$name" == "replica" || "$name" == "canister_sandbox" ]]; then
echo "# The replica and canister_sandbox binaries must have the same revision." >>"$DFX_ASSET_SOURCES"
Expand Down
8 changes: 0 additions & 8 deletions src/dfx/assets/dfx-asset-sources.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# generated by write-dfx-asset-sources.sh
replica-rev = '69e1408347723dbaa7a6cd2faa9b65c42abbe861'

[x86_64-darwin.ic-ref]
url = 'https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-a9f73dba-x86_64-darwin.tar.gz'
sha256 = 'e1c1694579f46d544aa87f6387d7e5a4b096fe65015b1609a459efcbaf15890f'

[x86_64-darwin.icx-proxy]
url = 'https://download.dfinity.systems/ic/69e1408347723dbaa7a6cd2faa9b65c42abbe861/openssl-static-binaries/x86_64-darwin/icx-proxy-dev.gz'
sha256 = 'b07f2784abddcb54f0b0d3ce7585b9283cf814870905d58c26a1c8823ead2fdd'
Expand Down Expand Up @@ -59,10 +55,6 @@ sha256 = '3ee345fb0357ee9305e911d8aa30a00675114c3247af79bb16b8c21f8477dc3c'
url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2023-10-13/ic-btc-canister.wasm.gz'
sha256 = '09f5647a45ff6d5d05b2b0ed48613fb2365b5fe6573ba0e901509c39fb9564ac'

[x86_64-linux.ic-ref]
url = 'https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-a9f73dba-x86_64-linux.tar.gz'
sha256 = '5c4967764e87d1b2945b1db027422633b48f08cd01d96ba2f622753fcb62c2a4'

[x86_64-linux.icx-proxy]
url = 'https://download.dfinity.systems/ic/69e1408347723dbaa7a6cd2faa9b65c42abbe861/openssl-static-binaries/x86_64-linux/icx-proxy-dev.gz'
sha256 = '2bff6952a65e2d94f49ffa5ce03bfbd0eef0fb6ca82a839844c84fd3efa8b280'
Expand Down
9 changes: 5 additions & 4 deletions src/dfx/assets/prepare_assets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ fn write_binary_cache(
Compression::new(6),
));
for (path, bin) in bins.into_iter().chain(
["ic-ref", "moc", "mo-doc", "mo-ide"]
["moc", "mo-doc", "mo-ide"]
.map(|bin| (bin.into(), bin_tars.remove(Path::new(bin)).unwrap())),
) {
let mut header = Header::new_gnu();
Expand Down Expand Up @@ -220,13 +220,14 @@ async fn download_bin_tarballs(
sources: Arc<HashMap<String, Source>>,
) -> HashMap<PathBuf, Bytes> {
let mut map = HashMap::new();
let [motoko, ic_ref] = ["motoko", "ic-ref"].map(|pkg| {
let [motoko] = ["motoko"].map(|pkg| {
let client = client.clone();
let source = sources[pkg].clone();
spawn(download_and_check_sha(client, source))
});
let (motoko, ic_ref) = tokio::try_join!(motoko, ic_ref).unwrap();
for tar in [motoko, ic_ref] {
let (motoko,) = tokio::try_join!(motoko,).unwrap();
{
let tar = motoko;
tar_xzf(&tar, |path, content| {
map.insert(path, content);
});
Expand Down
Loading