Skip to content

Commit

Permalink
Merge branch 'db/fix-install-script' of github.com:matter-labs/foundr…
Browse files Browse the repository at this point in the history
…y-zksync into db/fix-install-script
  • Loading branch information
dutterbutter committed Jan 31, 2025
2 parents 5970a8c + bca49e5 commit 99302ec
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.0.5"
".": "0.0.6"
}
1 change: 0 additions & 1 deletion .github/workflows/release-please.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,4 @@ jobs:
uses: ./.github/workflows/release.yml
with:
tag: ${{ needs.release-please.outputs.tag_name }}
version: ${{ (needs.release-please.outputs.tag_name && format('{0}.{1}.{2}', needs.release-please.outputs.major, needs.release-please.outputs.minor, needs.release-please.outputs.patch)) || ''}}
secrets: inherit
29 changes: 17 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ on:
type: string
required: true
default: ""
version:
description: "Version for the release."
type: string
required: true
default: ""

env:
CARGO_TERM_COLOR: always
Expand All @@ -43,21 +38,31 @@ jobs:
id: release_info
run: |
echo "nightly: $IS_NIGHTLY"
if [ $IS_NIGHTLY == "true" ]; then
TAG="${{ inputs.tag || format('nightly-{0}', github.sha) }}"
VERSION="${{ inputs.version || 'nightly' }}"
if [ $IS_NIGHTLY == "true" ]; then
if [ "${{inputs.tag}}" ]; then
TAG="${{ inputs.tag }}"
VERSION="${TAG#foundry-zksync-}"
else
TAG="${{ format('nightly-{0}', github.sha) }}"
VERSION=nightly
fi
echo "tag_name=${TAG}" >> $GITHUB_OUTPUT
echo "version_name=${VERSION}" >> $GITHUB_OUTPUT
echo "release_name=foundry-zksync Nightly ($(date '+%Y-%m-%d'))" >> $GITHUB_OUTPUT
echo "prerelease=true" >> $GITHUB_OUTPUT
else
TAG="${{ inputs.tag || format('stable-{0}', github.sha) }}"
VERSION="${{ inputs.version || 'stable' }}"
if [ "${{inputs.tag}}" ]; then
TAG="${{ inputs.tag }}"
VERSION="${TAG#foundry-zksync-}"
else
TAG="${{ format('stable-{0}', github.sha) }}"
VERSION=stable
fi
echo "tag_name=${TAG}" >> $GITHUB_OUTPUT
echo "version_name=v${VERSION}" >> $GITHUB_OUTPUT
echo "release_name=foundry-zksync v${VERSION}" >> $GITHUB_OUTPUT
echo "version_name=${VERSION}" >> $GITHUB_OUTPUT
echo "release_name=foundry-zksync ${VERSION}" >> $GITHUB_OUTPUT
echo "prerelease=false" >> $GITHUB_OUTPUT
fi
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## [0.0.6](https://github.com/matter-labs/foundry-zksync/compare/foundry-zksync-v0.0.5...foundry-zksync-v0.0.6) (2025-01-31)


### Features

* implement compiler backwards compatibility policy ([#843](https://github.com/matter-labs/foundry-zksync/issues/843)) ([469b770](https://github.com/matter-labs/foundry-zksync/commit/469b7700404178060e6ee135ab967d723851bfa2))


### Bug Fixes

* trim tag name to obtain version ([#885](https://github.com/matter-labs/foundry-zksync/issues/885)) ([113501c](https://github.com/matter-labs/foundry-zksync/commit/113501c28a53e95393e20f1ab37df8848b472b95))

## [0.0.5](https://github.com/matter-labs/foundry-zksync/compare/foundry-zksync-v0.0.4...foundry-zksync-v0.0.5) (2025-01-29)


Expand Down
70 changes: 35 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 99302ec

Please sign in to comment.