From ace6b24cfb3e256e766df5801c92c29cd0ab7529 Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 16 Dec 2021 16:14:11 +0100 Subject: [PATCH 1/2] bump version, increase circle timeout --- .circleci/config.yml | 2 +- changelogs/unreleased/1074-dark64 | 1 - zokrates_cli/Cargo.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 changelogs/unreleased/1074-dark64 diff --git a/.circleci/config.yml b/.circleci/config.yml index 8007b279..1a25b5e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -169,7 +169,7 @@ jobs: - run: rustup target add << parameters.target >> - run: name: Build - no_output_timeout: "30m" + no_output_timeout: "1h" command: RUSTFLAGS="--remap-path-prefix=$PWD=" << parameters.build-with >> build --target << parameters.target >> --release - tar_artifacts: target: << parameters.target >> diff --git a/changelogs/unreleased/1074-dark64 b/changelogs/unreleased/1074-dark64 deleted file mode 100644 index af06837b..00000000 --- a/changelogs/unreleased/1074-dark64 +++ /dev/null @@ -1 +0,0 @@ -Fix building issue with `aarch64-apple-darwin` target (M1) \ No newline at end of file diff --git a/zokrates_cli/Cargo.toml b/zokrates_cli/Cargo.toml index 932adcf4..d89e9477 100644 --- a/zokrates_cli/Cargo.toml +++ b/zokrates_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_cli" -version = "0.7.9" +version = "0.7.10" authors = ["Jacob Eberhardt ", "Dennis Kuhnert ", "Thibaut Schaeffer "] repository = "https://github.com/Zokrates/ZoKrates.git" edition = "2018" From f15a5f21bb63a44d4f5ede906360f0c77346de06 Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 16 Dec 2021 16:14:28 +0100 Subject: [PATCH 2/2] commit changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dd529ff..243fe8e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. ## [Unreleased] https://github.com/Zokrates/ZoKrates/compare/latest...develop +## [0.7.10] - 2021-12-16 + +### Release +- https://github.com/Zokrates/ZoKrates/releases/tag/0.7.10 + +### Changes +- Fix building issue with `aarch64-apple-darwin` target (M1) (#1074, @dark64) + ## [0.7.9] - 2021-12-14 ### Release