forked from hyperledger-cacti/cacti
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci(custom-checks): fix sibling pkg dependency version inconsistencies
I also snuck in a couple of additional changes in the interest of speeding up CI execution as soon as possible. Apologies for the intrusion! - Peter Somogyvari The additional changes are: 1. Comment out (e.g. disable) the odap-hermes plugin's tests for now since they are completely broken anyway and just wasting CI resources. 2. Fixed a logging bug in the custom-checks .ts script 3. Modified the ci.sh file (the workhorse of the CI) so that it does run the custom-checks as part of it. This was made possible by the change that this commit is originally intended to do (e.g., without this change the custom checks would fail but now they pass) Closes: hyperledger-cacti#2431 Co-authored-by: Peter Somogyvari <[email protected]> Signed-off-by: Peter Somogyvari <[email protected]> Signed-off-by: Tomasz Awramski <[email protected]>
- Loading branch information
Showing
7 changed files
with
37 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -988,33 +988,33 @@ jobs: | |
restore-keys: | | ||
${{ runner.os }}-yarn- | ||
- run: ./tools/ci.sh | ||
cactus-plugin-odap-hermes: | ||
continue-on-error: false | ||
env: | ||
FULL_BUILD_DISABLED: true | ||
JEST_TEST_PATTERN: packages/cactus-plugin-odap-hermes/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts | ||
JEST_TEST_RUNNER_DISABLED: false | ||
TAPE_TEST_RUNNER_DISABLED: true | ||
needs: build-dev | ||
runs-on: ubuntu-20.04 | ||
steps: | ||
- name: Use Node.js v16.14.2 | ||
uses: actions/[email protected] | ||
with: | ||
node-version: v16.14.2 | ||
- uses: actions/[email protected] | ||
- id: yarn-cache-dir-path | ||
name: Get yarn cache directory path | ||
run: echo "::set-output name=dir::$(yarn cache dir)" | ||
- id: yarn-cache | ||
name: Restore Yarn Cache | ||
uses: actions/[email protected] | ||
with: | ||
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
path: ${{ steps.yarn-cache-dir-path.outputs.dir }} | ||
restore-keys: | | ||
${{ runner.os }}-yarn- | ||
- run: ./tools/ci.sh | ||
# cactus-plugin-odap-hermes: | ||
# continue-on-error: false | ||
# env: | ||
# FULL_BUILD_DISABLED: true | ||
# JEST_TEST_PATTERN: packages/cactus-plugin-odap-hermes/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts | ||
# JEST_TEST_RUNNER_DISABLED: false | ||
# TAPE_TEST_RUNNER_DISABLED: true | ||
# needs: build-dev | ||
# runs-on: ubuntu-20.04 | ||
# steps: | ||
# - name: Use Node.js v16.14.2 | ||
# uses: actions/[email protected] | ||
# with: | ||
# node-version: v16.14.2 | ||
# - uses: actions/[email protected] | ||
# - id: yarn-cache-dir-path | ||
# name: Get yarn cache directory path | ||
# run: echo "::set-output name=dir::$(yarn cache dir)" | ||
# - id: yarn-cache | ||
# name: Restore Yarn Cache | ||
# uses: actions/[email protected] | ||
# with: | ||
# key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
# path: ${{ steps.yarn-cache-dir-path.outputs.dir }} | ||
# restore-keys: | | ||
# ${{ runner.os }}-yarn- | ||
# - run: ./tools/ci.sh | ||
cactus-plugin-connector-ubiquity: | ||
continue-on-error: false | ||
env: | ||
|
2 changes: 1 addition & 1 deletion
2
packages/cactus-cmd-api-server/src/test/resources/cactus-dummy-package/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"name": "@hyperledger/cactus-dummy-package", | ||
"version": "1.0.0", | ||
"version": "2.0.0-alpha.1", | ||
"description": "Dummy package for testing.", | ||
"main": "index.js" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters