diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml index e50be84..d67bd62 100644 --- a/.github/workflows/docker_main.yml +++ b/.github/workflows/docker_main.yml @@ -9,7 +9,7 @@ jobs: docker: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set build tag id: build_tag_generator @@ -25,16 +25,16 @@ jobs: --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \ --tag ghcr.io/hyperledger/firefly-tokens-erc1155:${{ steps.build_tag_generator.outputs.BUILD_TAG }} . - + - name: Tag release run: docker tag ghcr.io/hyperledger/firefly-tokens-erc1155:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger/firefly-tokens-erc1155:head - + - name: Push docker image run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin docker push ghcr.io/hyperledger/firefly-tokens-erc1155:${{ steps.build_tag_generator.outputs.BUILD_TAG }} - + - name: Push head tag run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - docker push ghcr.io/hyperledger/firefly-tokens-erc1155:head \ No newline at end of file + docker push ghcr.io/hyperledger/firefly-tokens-erc1155:head diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml index 038285e..bf9619e 100644 --- a/.github/workflows/docker_release.yml +++ b/.github/workflows/docker_release.yml @@ -8,7 +8,7 @@ jobs: docker: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -30,7 +30,7 @@ jobs: run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin docker push ghcr.io/hyperledger/firefly-tokens-erc1155:${GITHUB_REF##*/} - + - name: Push head tag run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bbe9bc0..65cb078 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,12 +10,12 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v3 with: - node-version: '16.x' + node-version: '20.9.0' - run: npm ci - run: npm run test @@ -25,12 +25,12 @@ jobs: run: working-directory: ./samples/solidity steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v3 with: - node-version: '16.x' + node-version: '20.9.0' - run: npm ci - run: npm run compile - run: npm run test diff --git a/Dockerfile b/Dockerfile index 5bf960b..67b1d5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine3.15 as solidity-build +FROM node:20-alpine3.17 as solidity-build RUN apk add python3 alpine-sdk USER node WORKDIR /home/node @@ -7,14 +7,14 @@ RUN npm install ADD --chown=node:node ./samples/solidity . RUN npx hardhat compile -FROM node:16-alpine3.15 as build +FROM node:20-alpine3.17 as build WORKDIR /root ADD package*.json ./ RUN npm install ADD . . RUN npm run build -FROM node:16-alpine3.15 +FROM node:20-alpine3.17 RUN apk add curl # We also need to keep copying it to the old location to maintain compatibility with the FireFly CLI COPY --from=solidity-build --chown=1001:0 /home/node/artifacts/contracts/ERC1155MixedFungible.sol/ERC1155MixedFungible.json /root/contracts/ diff --git a/test/suites/websocket.ts b/test/suites/websocket.ts index 2045950..afdf26f 100644 --- a/test/suites/websocket.ts +++ b/test/suites/websocket.ts @@ -1095,10 +1095,6 @@ export default (context: TestContext) => { context.resetConnectedPromise(); - await new Promise(resolve => { - setTimeout(resolve, 500); - }); - await context.server .ws('/api/ws') .sendJson({