-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1455 from o1-labs/merge/main-develop-feb-24
Merge main to develop
- Loading branch information
Showing
197 changed files
with
5,840 additions
and
2,655 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ name: Version Bump | |
| on: | ||
| workflow_dispatch: # Allow to manually trigger the workflow | ||
| schedule: | ||
| - cron: "0 0 * * 2" # At 00:00 UTC every Tuesday | ||
| - cron: '0 0 * * 2' # At 00:00 UTC every Tuesday | ||
|
|
||
| jobs: | ||
| version-bump: | ||
|
|
@@ -23,10 +23,9 @@ jobs: | |
| - name: Check if it's an even week | ||
| run: | | ||
| WEEK_NUM=$(date +'%V') | ||
| if [ $((WEEK_NUM % 2)) -eq 0 ]; then | ||
| echo "RUN_JOB=true" >> $GITHUB_ENV | ||
| else | ||
| echo "RUN_JOB=false" >> $GITHUB_ENV | ||
| if [ $((WEEK_NUM % 2)) -ne 0 ]; then | ||
| echo "Odd week number ($WEEK_NUM), terminating job." | ||
| exit 1 | ||
| fi | ||
| - name: Check out the repository | ||
|
|
@@ -35,34 +34,43 @@ jobs: | |
| - name: Set up Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: "18" | ||
| node-version: '18' | ||
|
|
||
| - name: Configure Git | ||
| run: | | ||
| git config --local user.email "[email protected]" | ||
| git config --local user.name "GitHub Action" | ||
| - name: Bump patch version | ||
| if: ${{ env.RUN_JOB }} == 'true' | ||
| run: | | ||
| git fetch --prune --unshallow | ||
| git fetch --prune --unshallow --tags --force | ||
| NEW_VERSION=$(npm version patch) | ||
| echo "New version: $NEW_VERSION" | ||
| echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV | ||
| - name: Install npm dependencies | ||
| if: ${{ env.RUN_JOB }} == 'true' | ||
| run: npm install | ||
|
|
||
| - name: Update CHANGELOG.md | ||
| if: ${{ env.RUN_JOB }} == 'true' | ||
| run: | | ||
| npm run update-changelog | ||
| git add CHANGELOG.md | ||
| git commit -m "Update CHANGELOG for new version $NEW_VERSION" | ||
| - name: Delete existing release tag | ||
| run: | | ||
| if git rev-parse $NEW_VERSION >/dev/null 2>&1; then | ||
| git tag -d $NEW_VERSION | ||
| git push origin :refs/tags/$NEW_VERSION | ||
| fi | ||
| - name: Delete existing release branch | ||
| run: | | ||
| if git ls-remote --heads origin release/${NEW_VERSION} | grep release/${NEW_VERSION}; then | ||
| git push origin --delete release/${NEW_VERSION} | ||
| fi | ||
| - name: Create new release branch | ||
| if: ${{ env.RUN_JOB }} == 'true' | ||
| run: | | ||
| NEW_BRANCH="release/${NEW_VERSION}" | ||
| git checkout -b $NEW_BRANCH | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [submodule "src/snarkyjs-bindings"] | ||
| [submodule "src/o1js-bindings"] | ||
| path = src/bindings | ||
| url = https://github.com/o1-labs/snarkyjs-bindings.git | ||
| url = https://github.com/o1-labs/o1js-bindings.git | ||
| [submodule "src/mina"] | ||
| path = src/mina | ||
| url = https://github.com/MinaProtocol/mina.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.