Skip to content

Commit

Permalink
Update versions following v1.7.1 release
Browse files Browse the repository at this point in the history
Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
  • Loading branch information
bestbeforetoday committed Dec 20, 2024
1 parent a42c63b commit 1df38a4
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verify-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permissions:
contents: read

env:
GATEWAY_VERSION: 1.7.1
GATEWAY_VERSION: 1.7.2

jobs:
go:
Expand Down
15 changes: 9 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ build-node:
rm -f fabric-gateway-dev.tgz && \
mv $$(npm pack) fabric-gateway-dev.tgz

.PHONY: build-scenario-node
build-scenario-node: build-node
cd '$(scenario_dir)/node' && \
npm ci && \
npm install @hyperledger/fabric-gateway@file:../../node/fabric-gateway-dev.tgz


.PHONY: build-java
build-java:
cd '$(java_dir)' && \
Expand Down Expand Up @@ -175,17 +182,13 @@ scenario-test-go-no-hsm: vendor-chaincode
go test -timeout 20m -tags pkcs11 -v --godog.tags='~@hsm' -args '$(scenario_dir)/features/'

.PHONY: scenario-test-node
scenario-test-node: vendor-chaincode build-node fabric-ca-client setup-softhsm
scenario-test-node: vendor-chaincode build-scenario-node fabric-ca-client setup-softhsm
cd '$(scenario_dir)/node' && \
npm ci && \
npm install @hyperledger/fabric-gateway@file:../../node/fabric-gateway-dev.tgz && \
npm test

.PHONY: scenario-test-node-no-hsm
scenario-test-node-no-hsm: vendor-chaincode build-node fabric-ca-client
scenario-test-node-no-hsm: vendor-chaincode build-scenario-node fabric-ca-client
cd '$(scenario_dir)/node' && \
npm ci && \
npm install @hyperledger/fabric-gateway@file:../../node/fabric-gateway-dev.tgz && \
npm run test:no-hsm

.PHONY: scenario-test-java
Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>org.hyperledger.fabric</groupId>
<artifactId>fabric-gateway</artifactId>
<version>1.7.1-SNAPSHOT</version>
<version>1.7.2-SNAPSHOT</version>
<packaging>jar</packaging>

<name>fabric-gateway</name>
Expand Down
6 changes: 3 additions & 3 deletions node/package-lock.json

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

2 changes: 1 addition & 1 deletion node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hyperledger/fabric-gateway",
"version": "1.7.1",
"version": "1.7.2",
"description": "Hyperledger Fabric Gateway client API for Node",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions scenario/node/package-lock.json

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

2 changes: 2 additions & 0 deletions scripts/update-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ PROJECT_DIR="$( cd "$( dirname -- "${BASH_SOURCE[0]}" )/.." > /dev/null && pwd )
VERIFY_VERSIONS="${PROJECT_DIR}/.github/workflows/verify-versions.yml"
JAVA_DIR="${PROJECT_DIR}/java"
NODE_DIR="${PROJECT_DIR}/node"
NODE_SCENARIO_DIR="${PROJECT_DIR}/scenario/node"

if [ $# -eq 1 ]; then
NEXT_VERSION="$1"
Expand All @@ -29,6 +30,7 @@ echo "Updating Java version to ${NEXT_JAVA_VERSION}"
echo "Updating Node version to ${NEXT_VERSION}"
( cd "${NODE_DIR}" && \
npm --allow-same-version --no-git-tag-version version "${NEXT_VERSION}" )
make build-scenario-node

echo "Updating verify-versions.yml to ${NEXT_VERSION}"
NEXT_VERIFY_VERSIONS="$( sed -r "s/^([ \t]*GATEWAY_VERSION:[ \t]*)[0-9.]+/\1${NEXT_VERSION}/" "${VERIFY_VERSIONS}" )"
Expand Down

0 comments on commit 1df38a4

Please sign in to comment.