Skip to content

Commit

Permalink
ci(custom-checks): fix sibling pkg dependency version inconsistencies
Browse files Browse the repository at this point in the history
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
rwat17 authored and petermetz committed Jun 17, 2023
1 parent d72ff0a commit 3868a3f
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 36 deletions.
54 changes: 27 additions & 27 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
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"
}
4 changes: 2 additions & 2 deletions packages/cactus-plugin-htlc-eth-besu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"web3js-quorum": "21.7.0-rc1"
},
"devDependencies": {
"@hyperledger/cactus-plugin-keychain-memory": "1.2.0",
"@hyperledger/cactus-test-tooling": "1.2.0",
"@hyperledger/cactus-plugin-keychain-memory": "2.0.0-alpha.1",
"@hyperledger/cactus-test-tooling": "2.0.0-alpha.1",
"@types/express": "4.17.13"
},
"engines": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@hyperledger/cactus-api-client": "2.0.0-alpha.1",
"@hyperledger/cactus-common": "1.2.0",
"@hyperledger/cactus-common": "2.0.0-alpha.1",
"@hyperledger/cactus-test-tooling": "2.0.0-alpha.1",
"@types/config": "0.0.41"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/cactus-plugin-ledger-connector-ubiquity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@
"tsc": "tsc --project ./tsconfig.json"
},
"dependencies": {
"@hyperledger/cactus-core": "1.1.2",
"@hyperledger/cactus-core-api": "1.1.2",
"@hyperledger/cactus-core": "2.0.0-alpha.1",
"@hyperledger/cactus-core-api": "2.0.0-alpha.1",
"@ubiquity/ubiquity-ts-client-modified": "https://github.com/RafaelAPB/ubiquity-ts-client-mirror.git",
"dotenv": "16.0.1",
"typescript-optional": "2.0.1"
},
"devDependencies": {
"@hyperledger/cactus-common": "1.1.2",
"@hyperledger/cactus-test-tooling": "1.1.2",
"@hyperledger/cactus-common": "2.0.0-alpha.1",
"@hyperledger/cactus-test-tooling": "2.0.0-alpha.1",
"@types/express": "4.17.8"
},
"engines": {
Expand Down
1 change: 1 addition & 0 deletions tools/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ function mainTask()
fi

yarn tools:validate-bundle-names
yarn custom-checks

if [ "${JEST_TEST_RUNNER_DISABLED:-false}" = "true" ]; then
echo "$(date +%FT%T%z) [CI] Jest test runner disabled. Skipping..."
Expand Down
2 changes: 1 addition & 1 deletion tools/custom-checks/run-custom-checks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export async function runCustomChecks(
let overallSuccess = true;
let overallErrors: string[] = [];

console.log("${TAG} Current NodeJS version is v", version);
console.log(`${TAG} Current NodeJS version is v${version}`);

{
const [success, errors] = await checkOpenApiJsonSpecs({ argv, env });
Expand Down

0 comments on commit 3868a3f

Please sign in to comment.