Skip to content

Commit e1b9ecb

Browse files
authored
Merge pull request #121 from kaleido-io/dependencies
Dependencies
2 parents a3ff4bb + 0c1bc69 commit e1b9ecb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+12416
-35083
lines changed

.github/workflows/docker_main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
docker:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313

1414
- name: Set build tag
1515
id: build_tag_generator
@@ -25,16 +25,16 @@ jobs:
2525
--label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
2626
--label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
2727
--tag ghcr.io/hyperledger/firefly-sandbox:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
28-
28+
2929
- name: Tag release
3030
run: docker tag ghcr.io/hyperledger/firefly-sandbox:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger/firefly-sandbox:head
31-
31+
3232
- name: Push docker image
3333
run: |
3434
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
3535
docker push ghcr.io/hyperledger/firefly-sandbox:${{ steps.build_tag_generator.outputs.BUILD_TAG }}
36-
36+
3737
- name: Push head tag
3838
run: |
3939
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
40-
docker push ghcr.io/hyperledger/firefly-sandbox:head
40+
docker push ghcr.io/hyperledger/firefly-sandbox:head

.github/workflows/docker_release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ jobs:
88
docker:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212

1313
- name: Build
1414
run: docker build -t ghcr.io/hyperledger/firefly-sandbox:${GITHUB_REF##*/} .
15-
15+
1616
- name: Tag release
1717
if: github.event.action == 'released'
1818
run: docker tag ghcr.io/hyperledger/firefly-sandbox:${GITHUB_REF##*/} ghcr.io/hyperledger/firefly-sandbox:latest
19-
19+
2020
- name: Push docker image
2121
run: |
2222
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
2323
docker push ghcr.io/hyperledger/firefly-sandbox:${GITHUB_REF##*/}
24-
24+
2525
- name: Push latest tag
2626
if: github.event.action == 'released'
2727
run: |
2828
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
29-
docker push ghcr.io/hyperledger/firefly-sandbox:latest
29+
docker push ghcr.io/hyperledger/firefly-sandbox:latest

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Use Node.js
16-
uses: actions/setup-node@v3
16+
uses: actions/setup-node@v4
1717
with:
18-
node-version: "16.x"
18+
node-version: "v20.11.1"
1919
- run: npm ci
2020
working-directory: ./server
2121
- run: npm run test

.vscode/launch.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
"request": "launch",
1010
"type": "node",
1111
"outputCapture": "std"
12+
},
13+
{
14+
"name": "Launch Chrome",
15+
"request": "launch",
16+
"type": "chrome",
17+
"url": "http://localhost:3000",
18+
"webRoot": "${workspaceFolder}/ui"
1219
}
1320
]
1421
}

server/jest.config.js renamed to server/jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
1+
/** @type {import('ts-jest').JestConfigWithTsJest} */
22
module.exports = {
33
preset: 'ts-jest',
44
testEnvironment: 'node',

0 commit comments

Comments
 (0)