Skip to content

Commit

Permalink
Merge branch 'main' into publish-arm
Browse files Browse the repository at this point in the history
  • Loading branch information
dzikowski authored Sep 9, 2024
2 parents f94d7a4 + bc6d5eb commit 7c65c0d
Show file tree
Hide file tree
Showing 8 changed files with 1,186 additions and 8,747 deletions.
23 changes: 13 additions & 10 deletions .github/workflows/release-on-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,19 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set version from tag and update tag
- name: Verify version
run: |
TAG=$(git describe --tags --abbrev=0)
VERSION=${TAG:1}
echo "TAG: $TAG"
echo "VERSION: $VERSION"
./bump_version.sh set "$VERSION"
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git commit -a -m "Set version from tag: $TAG"
git tag -a "$TAG" -m "Release $TAG"
git push origin "$TAG"
PKG_JSON_VERSION=$(jq -r '.version' <"$GITHUB_WORKSPACE/package.json")
if [ "$VERSION" != "$PKG_JSON_VERSION" ]; then
echo "Version in package.json ($PKG_JSON_VERSION) does not match tag ($VERSION)"
exit 1
fi
- name: Build Fablo
run: |
Expand Down Expand Up @@ -53,8 +52,12 @@ jobs:
docs/schema.json
fablo.sh
- name: Set next development version
- name: Create next development version PR
run: |
./bump_version.sh unstable
NEW_VERSION=$(jq -r '.version' <"$GITHUB_WORKSPACE/package.json")
BRANCH_NAME="bump-version-to-$NEW_VERSION"
git checkout -b $BRANCH_NAME
git commit -a -m "Set new development version: $NEW_VERSION"
git push origin HEAD
git push --set-upstream origin bump-version-to-$NEW_VERSION
git gh pr create --title "Bump Version to $NEW_VERSION" --body "Bump Version to $NEW_VERSION" --label "bump-version-pr" --head "bump-version-to-$NEW_VERSION" --base main
2,106 changes: 1,116 additions & 990 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion samples/chaincodes/chaincode-kv-node-1.4/.nvmrc

This file was deleted.

50 changes: 0 additions & 50 deletions samples/chaincodes/chaincode-kv-node-1.4/index.js

This file was deleted.

99 changes: 0 additions & 99 deletions samples/chaincodes/chaincode-kv-node-1.4/index.spec.js

This file was deleted.

Loading

0 comments on commit 7c65c0d

Please sign in to comment.