Skip to content

Commit

Permalink
Merge branch 'hyperledger-labs:main' into BE-393-BootTimeFunctionality
Browse files Browse the repository at this point in the history
  • Loading branch information
Web-Dev-Manoj authored Sep 4, 2023
2 parents ad4d3c4 + 7063492 commit 8871e56
Show file tree
Hide file tree
Showing 10 changed files with 57,898 additions and 9,898 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: build

on:
push:
branches:
- main
pull_request:
branches:
- main
jobs:
build:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [12.x, 14.x]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: install server dependencies
run: npm install

- name: build server
run: npm run build

- name: install client dependencies
run: npm install --prefix client


- name: build client
run: CI=false npm run build --prefix client #warnning are considered as failed build, skipping warnings

4 changes: 2 additions & 2 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened]
workflow_dispatch:

jobs:
sonarcloud:
name: SonarCloud
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: test

on:
push:
branches:
- main
pull_request:
branches:
- main
jobs:
build:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [12.x, 14.x]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: install dependencies
run: npm install

- name: run test
run: npm test


2 changes: 2 additions & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Maintainers are busy and delegate many decisions to other trusted contributors.
| Name | GitHub |
|------|--------|
| Arun S M | [arsulegai][arsulegai] |
| Saundarya Saurabh| [saundarya-saurabh][saundarya-saurabh] |
| Sunny Ajin | [SunnyAjin][SunnyAjin] |


**Release Managers**
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/hyperledger/blockchain-explorer?sort=semver)](https://github.com/hyperledger/blockchain-explorer/releases)
[![Docker Pulls](https://img.shields.io/docker/pulls/hyperledger/explorer)](https://hub.docker.com/r/hyperledger/explorer)
![node-current](https://img.shields.io/node/v/fabric-network?color=blue)<br />
[![Build Status](https://dev.azure.com/Hyperledger/blockchain-explorer/_apis/build/status/Blockchain-Explorer?branchName=main)](https://dev.azure.com/Hyperledger/blockchain-explorer/_build/latest?definitionId=41&branchName=main)
[![Build Status](https://github.com/adityajoshi12/blockchain-explorer/actions/workflows/build.yaml/badge.svg
)](https://github.com/adityajoshi12/blockchain-explorer/actions/workflows/build.yaml/badge.svg
)
[![CII Best Practice](https://bestpractices.coreinfrastructure.org/projects/2710/badge)](https://bestpractices.coreinfrastructure.org/projects/2710)
[![Documentation Status](https://readthedocs.org/projects/blockchain-explorer/badge/?version=main)](https://blockchain-explorer.readthedocs.io/en/main/?badge=main)
[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/hyperledger/blockchain-explorer.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/hyperledger/blockchain-explorer/context:javascript)
[![Total alerts](https://img.shields.io/lgtm/alerts/g/hyperledger/blockchain-explorer.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/hyperledger/blockchain-explorer/alerts/)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=hyperledger_blockchain-explorer&metric=alert_status)](https://sonarcloud.io/dashboard?id=hyperledger_blockchain-explorer)
[![Test](https://github.com/adityajoshi12/blockchain-explorer/actions/workflows/test.yaml/badge.svg)](https://github.com/adityajoshi12/blockchain-explorer/actions/workflows/test.yaml/badge.svg)
<!-- badges -->


Expand Down
2 changes: 1 addition & 1 deletion app/test/FabricGateway.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ describe('getDiscoveryResult', () => {

it('should return without error', async () => {
await gw.getDiscoveryResult('testChannel');
expect(stubSetupDiscoveryRequest.calledOnce).be.equal(false);
expect(stubSetupDiscoveryRequest.calledOnce).be.equal(true);
});

it('should return without error if discover service has not been allocated yet', async () => {
Expand Down
Loading

0 comments on commit 8871e56

Please sign in to comment.