From 3f35407a2bbcb810090c82807eb3ecf0582f6744 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 22 Oct 2024 00:24:49 +0300 Subject: [PATCH 1/3] version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32a418c28..6c9f0d726 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "o1js", - "version": "1.9.1", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "o1js", - "version": "1.9.1", + "version": "2.0.0", "license": "Apache-2.0", "dependencies": { "blakejs": "1.2.1", diff --git a/package.json b/package.json index 1c5896d26..40d2ed962 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "o1js", "description": "TypeScript framework for zk-SNARKs and zkApps", - "version": "1.9.1", + "version": "2.0.0", "license": "Apache-2.0", "homepage": "https://github.com/o1-labs/o1js/", "repository": { From b24a315ad7d16b2d2e03a88f6f7b087ee6048944 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 22 Oct 2024 00:25:00 +0300 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 363978e7c..144f77cac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,9 +15,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm _Security_ in case of vulnerabilities. --> -## [Unreleased](https://github.com/o1-labs/o1js/compare/7e9394...HEAD) +## [Unreleased](https://github.com/o1-labs/o1js/compare/b04520d...HEAD) -## [2.0.0](https://github.com/o1-labs/o1js/compare/f15293a69...HEAD) +## [2.0.0](https://github.com/o1-labs/o1js/compare/7e9394...b04520d) ### Breaking Changes From 7dbea548d23376afee9401473884e293c782d716 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 22 Oct 2024 00:26:35 +0300 Subject: [PATCH 3/3] adjust ci --- .github/workflows/build-action.yml | 2 ++ .github/workflows/live-tests.yml | 6 ++++-- .github/workflows/pkg-pr-new-publish.yml | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-action.yml b/.github/workflows/build-action.yml index 111b302c6..2837c800c 100644 --- a/.github/workflows/build-action.yml +++ b/.github/workflows/build-action.yml @@ -4,6 +4,8 @@ on: branches: - main - develop + - v1 + - v3 pull_request: workflow_dispatch: {} diff --git a/.github/workflows/live-tests.yml b/.github/workflows/live-tests.yml index ef8132171..a4be3529f 100644 --- a/.github/workflows/live-tests.yml +++ b/.github/workflows/live-tests.yml @@ -3,11 +3,13 @@ on: push: branches: - main - - v2 + - v3 + - v1 pull_request: branches: - main - - v2 + - v3 + - v1 workflow_dispatch: {} jobs: diff --git a/.github/workflows/pkg-pr-new-publish.yml b/.github/workflows/pkg-pr-new-publish.yml index 134650eec..1773af92c 100644 --- a/.github/workflows/pkg-pr-new-publish.yml +++ b/.github/workflows/pkg-pr-new-publish.yml @@ -7,6 +7,8 @@ on: push: branches: - main + - v1 + - v3 workflow_dispatch: {} jobs: