Skip to content

Commit 34e125d

Browse files
bestbeforetodaybestbeforetoday
committed
Update runtime and tool versions
- Node latest LTS - Go latest stable - Fabric 2.5.14, 3.1.3 - Just 1.43.0 - k9s 0.50.15 - Kind 0.30.0 - yq 4.48.1 - nvm 0.40.3 This addresses build breakages due to back-level versions. Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
1 parent 301db81 commit 34e125d

18 files changed

Lines changed: 157 additions & 163 deletions

File tree

‎.github/actions/fsat-setup/action.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ description: Set up the Full Stack Asset Transfer Guide Dependencies
33
inputs:
44
node-version:
55
description: Version of node
6-
default: 20.x
6+
default: "lts/*"
77
just-version:
88
description: Just Version
9-
default: "1.24.0"
9+
default: "1.43.0"
1010
k9s-version:
1111
description: k9s Version
12-
default: v0.25.3
12+
default: v0.50.15
1313
fabric-version:
1414
description: Version of Hyperledger Fabric
15-
default: "2.5.13"
15+
default: "2.5.14"
1616
ca-version:
1717
description: Version of Hyperledger Fabric CA
1818
default: "1.5.15"
1919

2020
runs:
2121
using: "composite"
2222
steps:
23-
- uses: actions/setup-node@v4
23+
- uses: actions/setup-node@v6
2424
with:
2525
node-version: ${{ inputs.node-version }}
2626
cache: "npm"
@@ -29,8 +29,8 @@ runs:
2929
- name: Install k9s
3030
shell: bash
3131
run: |
32-
curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/${{ inputs.k9s-version }}/k9s_Linux_x86_64.tar.gz -o /tmp/k9s_Linux_x86_64.tar.gz
33-
tar -zxf /tmp/k9s_Linux_x86_64.tar.gz -C /usr/local/bin k9s
32+
curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/${{ inputs.k9s-version }}/k9s_Linux_amd64.tar.gz -o /tmp/k9s_Linux_amd64.tar.gz
33+
tar -zxf /tmp/k9s_Linux_amd64.tar.gz -C /usr/local/bin k9s
3434
sudo chown root /usr/local/bin/k9s
3535
sudo chmod 755 /usr/local/bin/k9s
3636

‎.github/actions/test-network-setup/action.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,35 @@ description: Set up the Test Network Runtime
33
inputs:
44
go-version:
55
description: Version of go
6-
default: "1.23"
6+
default: stable
77
node-version:
88
description: Version of node
9-
default: 20.x
9+
default: "lts/*"
1010
java-version:
1111
description: Version of JDK
1212
default: 25.x
1313
fabric-version:
1414
description: Version of Hyperledger Fabric
15-
default: 2.5.13
15+
default: 2.5.14
1616
ca-version:
1717
description: Version of Hyperledger Fabric CA
1818
default: 1.5.15
1919

2020
runs:
2121
using: "composite"
2222
steps:
23-
- uses: actions/setup-go@v5
23+
- uses: actions/setup-go@v6
2424
with:
2525
go-version: ${{ inputs.go-version }}
2626
cache-dependency-path: "**/go.sum"
2727

28-
- uses: actions/setup-node@v4
28+
- uses: actions/setup-node@v6
2929
with:
3030
node-version: ${{ inputs.node-version }}
3131
cache: "npm"
3232
cache-dependency-path: "**/package-lock.json"
3333

34-
- uses: actions/setup-java@v4
34+
- uses: actions/setup-java@v5
3535
with:
3636
distribution: temurin
3737
java-version: ${{ inputs.java-version }}

‎.github/workflows/lint.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
env:
19-
GO_VER: "1.23"
20-
NODE_VER: 20.x
19+
NODE_VER: "lts/*"
2120
JAVA_VER: 25.x
2221

2322
jobs:
2423
go:
2524
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
2625
steps:
27-
- uses: actions/setup-go@v5
26+
- uses: actions/setup-go@v6
2827
with:
29-
go-version: ${{ env.GO_VER }}
28+
go-version: stable
3029
- uses: actions/checkout@v5
3130
- run: go install golang.org/x/tools/cmd/goimports@latest
3231
- run: ci/scripts/lint-go.sh
@@ -35,7 +34,7 @@ jobs:
3534
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
3635
steps:
3736
- uses: actions/checkout@v5
38-
- uses: actions/setup-node@v5
37+
- uses: actions/setup-node@v6
3938
with:
4039
node-version: ${{ env.NODE_VER }}
4140
- run: ci/scripts/lint-typescript.sh
@@ -44,7 +43,7 @@ jobs:
4443
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
4544
steps:
4645
- uses: actions/checkout@v5
47-
- uses: actions/setup-node@v5
46+
- uses: actions/setup-node@v6
4847
with:
4948
node-version: ${{ env.NODE_VER }}
5049
- run: ci/scripts/lint-javascript.sh
@@ -53,7 +52,7 @@ jobs:
5352
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
5453
steps:
5554
- uses: actions/checkout@v5
56-
- uses: actions/setup-java@v4
55+
- uses: actions/setup-java@v5
5756
with:
5857
distribution: temurin
5958
java-version: ${{ env.JAVA_VER }}

‎.github/workflows/rest-sample.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: REST Sample 🐧
55
run-name: ${{ github.actor }} is testing the REST Sample 🐧
66

77
env:
8-
NODE_VER: 20.x
8+
NODE_VER: "lts/*"
99

1010
on:
1111
workflow_dispatch:
@@ -28,7 +28,7 @@ jobs:
2828
- name: Checkout
2929
uses: actions/checkout@v5
3030

31-
- uses: actions/setup-node@v5
31+
- uses: actions/setup-node@v6
3232
with:
3333
node-version: ${{ env.NODE_VER }}
3434
cache: "npm"

‎.github/workflows/test-network-bft-orderer.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network with BFT Orderer tests
77
on:
88
workflow_dispatch:
99
push:
10-
branches: [ "main" ]
10+
branches: ["main"]
1111
pull_request:
12-
branches: [ "main" ]
12+
branches: ["main"]
1313

1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -38,7 +38,7 @@ jobs:
3838
# Note: The default Fabric version for CI is currently the latest LTS (v2.5.x).
3939
# To test BFT Orderers, Fabric v3.x is explicitly specified here.
4040
with:
41-
fabric-version: 3.1.1
41+
fabric-version: 3.1.3
4242

4343
- name: Run Test Network with BFT Orderers
4444
working-directory: test-network

‎asset-transfer-basic/chaincode-external/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
ARG GO_VER=1.23
6-
ARG ALPINE_VER=3.21
7-
8-
FROM golang:${GO_VER}-alpine${ALPINE_VER}
5+
FROM golang:alpine
96

107
WORKDIR /go/src/github.com/hyperledger/fabric-samples/asset-transfer-basic/chaincode-external
118
COPY . .

‎asset-transfer-basic/chaincode-typescript/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# SPDX-License-Identifier: Apache-2.0
33
#
4-
FROM node:22 AS builder
4+
FROM node:lts AS builder
55

66
WORKDIR /usr/src/app
77

@@ -11,7 +11,7 @@ ENV npm_config_cache=/usr/src/app
1111
RUN npm ci && npm run package
1212

1313

14-
FROM node:22 AS production
14+
FROM node:lts AS production
1515
ARG CC_SERVER_PORT
1616

1717
# Setup tini to work better handle signals

‎asset-transfer-basic/rest-api-typescript/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:22-alpine AS build
1+
FROM node:lts-alpine AS build
22

33
RUN apk add --no-cache g++ make python3 dumb-init
44

@@ -10,7 +10,7 @@ RUN npm ci
1010
RUN npm run build
1111
RUN npm prune --production
1212

13-
FROM node:22-alpine
13+
FROM node:lts-alpine
1414
ENV NODE_ENV production
1515
WORKDIR /app
1616

‎asset-transfer-private-data/chaincode-typescript/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# SPDX-License-Identifier: Apache-2.0
33
#
4-
FROM node:22 AS builder
4+
FROM node:lts AS builder
55

66
WORKDIR /usr/src/app
77

@@ -11,7 +11,7 @@ ENV npm_config_cache=/usr/src/app
1111
RUN npm ci && npm run package
1212

1313

14-
FROM node:22 AS production
14+
FROM node:lts AS production
1515
ARG CC_SERVER_PORT
1616

1717
# Setup tini to work better handle signals

‎full-stack-asset-transfer-guide/applications/rest-api/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:22-alpine AS build
1+
FROM node:lts-alpine AS build
22
WORKDIR /app
33
COPY package.json /app
44
RUN npm install

0 commit comments

Comments
 (0)