Skip to content

Commit d92ce91

Browse files
committed
ci: fix ci errors
Signed-off-by: Carlos Amaro <[email protected]>
1 parent 29ddd5e commit d92ce91

File tree

5 files changed

+13
-42
lines changed

5 files changed

+13
-42
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ jobs:
336336
TOOLS_VALIDATE_BUNDLE_NAMES_DISABLED: true
337337
CUSTOM_CHECKS_DISABLED: true
338338
CONFIGURE_DISABLED: false
339+
FREE_UP_GITHUB_RUNNER_DISK_SPACE_DISABLED: false
339340
needs: build-dev
340341
runs-on: ubuntu-22.04
341342
steps:
@@ -1933,40 +1934,6 @@ jobs:
19331934
with:
19341935
name: coverage-reports-36
19351936
path: ./code-coverage-ts/**/
1936-
cactus-plugin-bungee-hermes:
1937-
continue-on-error: false
1938-
env:
1939-
FULL_BUILD_DISABLED: true
1940-
JEST_TEST_RUNNER_DISABLED: false
1941-
JEST_TEST_PATTERN: packages/cactus-plugin-bungee-hermes/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts
1942-
TAPE_TEST_RUNNER_DISABLED: true
1943-
needs: build-dev
1944-
runs-on: ubuntu-22.04
1945-
steps:
1946-
- name: Use Node.js ${{ env.NODEJS_VERSION }}
1947-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b #v4.0.3
1948-
with:
1949-
node-version: ${{ env.NODEJS_VERSION }}
1950-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
1951-
1952-
- name: Install native build dependencies
1953-
run: |
1954-
sudo apt-get update
1955-
sudo apt-get install -y build-essential python3 python3-pip gcc g++ make pkg-config libsqlite3-dev
1956-
1957-
- id: yarn-cache
1958-
name: Restore Yarn Cache
1959-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf #v4.2.2
1960-
with:
1961-
key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
1962-
path: ./.yarn/
1963-
restore-keys: |
1964-
${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
1965-
1966-
- name: Clean and install dependencies
1967-
run: yarn cache clean && rm -rf node_modules && yarn install --immutable
1968-
1969-
- run: ./tools/ci.sh
19701937
ct-api-client:
19711938
continue-on-error: false
19721939
env:
@@ -2140,7 +2107,9 @@ jobs:
21402107
path: ./code-coverage-ts/**/
21412108

21422109
- name: Install Foundry
2143-
uses: foundry-rs/foundry-toolchain@ca7e86820a6802e19349b5622e91976c4561c454 #v1
2110+
uses: foundry-rs/foundry-toolchain@v1
2111+
with:
2112+
version: stable
21442113

21452114
- name: Run solidity tests
21462115
run: cd packages/cactus-plugin-htlc-eth-besu && forge test -vvvvv
@@ -2154,6 +2123,7 @@ jobs:
21542123
JEST_TEST_COVERAGE_PATH: ./code-coverage-ts/ctp-htlc-eth-besu-erc20
21552124
JEST_TEST_CODE_COVERAGE_ENABLED: true
21562125
TAPE_TEST_RUNNER_DISABLED: false
2126+
TAPE_TEST_PATTERN: ""
21572127
needs: build-dev
21582128
runs-on: ubuntu-22.04
21592129
steps:

examples/cactus-example-supply-chain-backend/src/main/go/shipment-contract/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ type ShipmentChaincode struct {
2121
}
2222

2323
type Shipment struct {
24-
Id string \`json:"id"\`
25-
BookshelfId string \`json:"bookshelfId"\`
24+
Id string `json:"id"`
25+
BookshelfId string `json:"bookshelfId"`
2626
}
2727

2828
func main() {

packages/cactus-plugin-bungee-hermes/src/test/typescript/integration/fabric-test-basic.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {
3030
} from "@hyperledger/cactus-plugin-ledger-connector-fabric";
3131
import {
3232
Containers,
33+
DEFAULT_FABRIC_2_AIO_IMAGE_NAME,
3334
FABRIC_25_LTS_AIO_FABRIC_VERSION,
3435
FABRIC_25_LTS_AIO_IMAGE_VERSION,
3536
FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1,
@@ -93,7 +94,7 @@ beforeEach(async () => {
9394
fabricLedger = new FabricTestLedgerV1({
9495
emitContainerLogs: true,
9596
publishAllPorts: true,
96-
imageName: "ghcr.io/hyperledger/cactus-fabric2-all-in-one",
97+
imageName: DEFAULT_FABRIC_2_AIO_IMAGE_NAME,
9798
imageVersion: FABRIC_25_LTS_AIO_IMAGE_VERSION,
9899
envVars: new Map([["FABRIC_VERSION", FABRIC_25_LTS_AIO_FABRIC_VERSION]]),
99100
logLevel,

packages/cactus-plugin-bungee-hermes/src/test/typescript/integration/fabric-test-pruning.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {
3030
} from "@hyperledger/cactus-plugin-ledger-connector-fabric";
3131
import {
3232
Containers,
33+
DEFAULT_FABRIC_2_AIO_IMAGE_NAME,
3334
FABRIC_25_LTS_AIO_FABRIC_VERSION,
3435
FABRIC_25_LTS_AIO_IMAGE_VERSION,
3536
FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1,
@@ -93,7 +94,7 @@ beforeEach(async () => {
9394
fabricLedger = new FabricTestLedgerV1({
9495
emitContainerLogs: true,
9596
publishAllPorts: true,
96-
imageName: "ghcr.io/hyperledger/cactus-fabric2-all-in-one",
97+
imageName: DEFAULT_FABRIC_2_AIO_IMAGE_NAME,
9798
imageVersion: FABRIC_25_LTS_AIO_IMAGE_VERSION,
9899
envVars: new Map([["FABRIC_VERSION", FABRIC_25_LTS_AIO_FABRIC_VERSION]]),
99100
logLevel,

packages/cactus-test-tooling/src/main/typescript/fabric/fabric-test-ledger-v1.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,11 @@ export interface PeerCerts {
9696
}
9797

9898
export const DEFAULT_FABRIC_2_AIO_IMAGE_NAME =
99-
"ghcr.io/hyperledger/cactus-fabric2-all-in-one";
99+
"ghcr.io/hyperledger-cacti/cactus-fabric2-all-in-one";
100100
export const DEFAULT_FABRIC_2_AIO_IMAGE_VERSION = "2023-08-17-issue2057-pr2135";
101101
export const DEFAULT_FABRIC_2_AIO_FABRIC_VERSION = "2.4.4";
102102

103-
export const FABRIC_25_LTS_AIO_IMAGE_VERSION =
104-
"2024-03-03--issue-2945-fabric-v2-5-6";
103+
export const FABRIC_25_LTS_AIO_IMAGE_VERSION = "v2.1.0";
105104
export const FABRIC_25_LTS_AIO_FABRIC_VERSION = "2.5.6";
106105

107106
/*

0 commit comments

Comments
 (0)