Skip to content

Commit d13fe48

Browse files
authored
Merge branch 'hyperledger:main' into issue-307-fix
2 parents 4f9318f + d66fdc9 commit d13fe48

14 files changed

Lines changed: 451 additions & 205 deletions

File tree

.github/workflows/release.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
contents: read
2727
id-token: write
2828
steps:
29-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
29+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
3030
with:
3131
node-version: "lts/*"
3232
registry-url: "https://registry.npmjs.org"
3333
# Ensure npm 11.5.1 or later for trusted publishing support
3434
- name: Update npm
3535
run: npm install -g npm@latest
36-
- uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
36+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
3737
with:
3838
name: node-tgzs
3939
path: build/
@@ -64,22 +64,22 @@ jobs:
6464
- name: Get commit timestamp
6565
run: echo "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" >> "${GITHUB_ENV}"
6666
- name: Login to GitHub Container Registry
67-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
67+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
6868
with:
6969
registry: ghcr.io
7070
username: ${{ github.actor }}
7171
password: ${{ secrets.GITHUB_TOKEN }}
7272
- name: Login to Docker Hub
73-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
73+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
7474
with:
7575
registry: docker.io
7676
username: ${{ secrets.DOCKERHUB_USERNAME }}
7777
password: ${{ secrets.DOCKERHUB_TOKEN }}
7878
- name: Set up Docker Buildx
79-
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
79+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
8080
- name: Build image
8181
id: build
82-
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
82+
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
8383
with:
8484
file: docker/fabric-nodeenv/Dockerfile
8585
context: docker/fabric-nodeenv
@@ -92,7 +92,7 @@ jobs:
9292
digest="${{ steps.build.outputs.digest }}"
9393
touch "${{ runner.temp }}/digests/${digest#sha256:}"
9494
- name: Upload digest
95-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
95+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
9696
with:
9797
name: digest-${{ matrix.arch.platform }}
9898
path: ${{ runner.temp }}/digests/*
@@ -113,28 +113,28 @@ jobs:
113113
- ghcr.io
114114
steps:
115115
- name: Download digests
116-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
116+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
117117
with:
118118
path: ${{ runner.temp }}/digests
119119
pattern: digest-*
120120
merge-multiple: true
121121
- name: Login to ${{ matrix.registry }}
122-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
122+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
123123
with:
124124
registry: ${{ matrix.registry }}
125125
username: ${{ matrix.registry == 'docker.io' && secrets.DOCKERHUB_USERNAME || github.actor }}
126126
password: ${{ matrix.registry == 'docker.io' && secrets.DOCKERHUB_TOKEN || secrets.GITHUB_TOKEN }}
127127
- name: Docker metadata
128128
id: meta
129-
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
129+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
130130
with:
131131
images: ${{ matrix.registry }}/${{ env.IMAGE_NAME }}
132132
tags: |
133133
type=semver,pattern={{version}}
134134
type=semver,pattern={{major}}.{{minor}}
135135
type=semver,pattern={{major}}.{{minor}}.{{patch}}
136136
- name: Set up Docker Buildx
137-
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
137+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
138138
- name: Create and push manifest list
139139
working-directory: ${{ runner.temp }}/digests
140140
run: |

.github/workflows/scan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424
with:
2525
ref: ${{ inputs.ref }}
26-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
26+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2727
with:
2828
node-version: "lts/*"
2929
- name: Install

.github/workflows/test.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-24.04
4141
steps:
4242
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
43-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
43+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
4444
with:
4545
node-version: "20.x"
4646
- name: Install/Rebuild/UnitTest
@@ -51,7 +51,7 @@ jobs:
5151
- name: Pre-process Artifacts
5252
run: |
5353
npx cobertura-merge -o merged_coverage.xml shim=./libraries/fabric-shim/coverage/cobertura-coverage.xml contractapi=./apis/fabric-contract-api/coverage/cobertura-coverage.xml -p
54-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
54+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5555
name: Upload test results
5656
if: ${{ !cancelled() }}
5757
with:
@@ -62,12 +62,12 @@ jobs:
6262
set -xev
6363
node common/scripts/install-run-rush.js publish --include-all --pack --release-folder tgz --publish
6464
docker image save hyperledger/fabric-nodeenv | gzip > fabric-nodeenv.tar.gz
65-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
65+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6666
name: Binaries
6767
with:
6868
name: node-tgzs
6969
path: tgz/
70-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
70+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7171
name: Docker
7272
with:
7373
name: nodeenv-docker-image
@@ -78,14 +78,14 @@ jobs:
7878
needs: build
7979
steps:
8080
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
81-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
81+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
8282
with:
8383
node-version: "20.x"
84-
- uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
84+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
8585
with:
8686
name: nodeenv-docker-image
8787
path: build/
88-
- uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
88+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
8989
with:
9090
name: node-tgzs
9191
path: build/
@@ -109,7 +109,7 @@ jobs:
109109
110110
node common/scripts/install-run-rush.js test:fv --verbose
111111
node common/scripts/install-run-rush.js test:e2e --verbose
112-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
112+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
113113
if: ${{ !cancelled() }}
114114
name: TestLogs
115115
with:

common/config/rush/pnpm-lock.yaml

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/scripts/install-run-rush-pnpm.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/scripts/install-run-rush.js

Lines changed: 22 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/scripts/install-run-rushx.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)