diff --git a/.github/workflows/check-code.yml b/.github/workflows/check-code.yml index ef22eba8b..98e1bf414 100644 --- a/.github/workflows/check-code.yml +++ b/.github/workflows/check-code.yml @@ -16,9 +16,17 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.8" - - name: Install dependencies + - name: Set up Nodejs + uses: actions/setup-node@v3 + with: + node-version: "20" + - name: Install Python dependencies run: | python -m pip install --upgrade pip python -m pip install tox tox-gh-actions + - name: Install Nodejs dependencies + working-directory: src/dashboard + run: | + yarn install --frozen-lockfile - name: Check code run: make check diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b8934740d..caed30fd6 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,6 +14,4 @@ jobs: - uses: actions/checkout@v3 - name: Build images run: | - docker build . --file "build_image/docker/common/api-engine/Dockerfile.in" --tag hyperledger/cello-api-engine:$(date +%s) - docker build . --file "build_image/docker/common/nginx/Dockerfile.in" --tag hyperledger/cello-nginx:$(date +%s) - docker build . --file "build_image/docker/common/dashboard/Dockerfile.in" --tag hyperledger/cello-dashboard:$(date +%s) + make docker-compose diff --git a/Makefile b/Makefile index cdf03de6e..62395c600 100755 --- a/Makefile +++ b/Makefile @@ -139,11 +139,7 @@ check: ##@Code Check code format @$(MAKE) license find ./docs -type f -name "*.md" -exec egrep -l " +$$" {} \; cd src/api-engine && tox && cd ${ROOT_PATH} - make docker-compose - MODE=dev make start - sleep 10 - MODE=dev make stop - make check-dashboard + cd src/dashboard && yarn lint && cd ${ROOT_PATH} deep-clean: ##@Clean Stop services, clean docker images and remove mounted local storage. make clean-images