Skip to content

Commit 873d8a0

Browse files
itai-temp-test-daitai-temp-test-da
authored
Merge branch 'hyperledger-labs:main' into main
2 parents 1badb11 + fbaccb3 commit 873d8a0

File tree

551 files changed

+12422
-3465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

551 files changed

+12422
-3465
lines changed

‎.github/actions/sbt/upload_logs/action.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ runs:
2222
pigz -r log/* || true
2323
fi
2424
25+
- name: Move potential additional debugging artifacts to log directory
26+
shell: bash
27+
run: |
28+
mkdir -p log
29+
# When Java crashes, it sometimes saves an error report such as hs_err_pid*.log to the working directory.
30+
mv *.log log/ || true
31+
# Possible locations of core dumps (/ is apparently a default, but who knows)
32+
mv core* log/ || true
33+
mv /core* log/ || true
34+
2535
# Certain characters are disallowed in artifact filenames in GHA, so we need to sanitize them
2636
- name: Sanitize filenames
2737
# Runs in nix to have access to `rename`

‎.github/actions/tests/pre_scala_test/action.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ inputs:
1111
description: "Skip the test if the commit messages on the branch match this regex"
1212
required: false
1313
default: ""
14+
run_if_commit_tag:
15+
description: "Run the job only if the commit message contains this tag"
16+
required: false
17+
default: ""
1418
skip_if_files_changed:
1519
description: "Skip the test if any of the given files was changed since the last release"
1620
required: false
@@ -52,6 +56,18 @@ runs:
5256
echo "Commit message ($msg) does not match regex (${{ inputs.skip_if_regex }}), not skipping"
5357
fi
5458
59+
- name: Check if include commit message tag matches
60+
if: ${{ inputs.run_if_commit_tag != '' }}
61+
shell: bash
62+
run: |
63+
last_commit_msg=$(git log -1 --pretty=%B)
64+
if [[ $last_commit_msg =~ "[${{ inputs.run_if_commit_tag }}]" ]]; then
65+
echo "Commit message ($last_commit_msg) includes tag (${{ inputs.run_if_commit_tag }}), running"
66+
else
67+
echo "Commit message ($last_commit_msg) does not include tag (${{ inputs.run_if_commit_tag }}), skipping"
68+
echo "skip=true" >> "$GITHUB_ENV"
69+
fi
70+
5571
- name: Check if skip files changed
5672
if: ${{ inputs.skip_if_files_changed != '' }}
5773
shell: bash

‎.github/workflows/build.daml_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
daml_test:
1212
runs-on: self-hosted-k8s-small
1313
container:
14-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-ci:0.3.12
14+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-ci:0.3.12
1515

1616
steps:
1717

‎.github/workflows/build.deployment_test.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: self-hosted-k8s-x-small
1313

1414
container:
15-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-ci:0.3.12
15+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-ci:0.3.12
1616

1717
steps:
1818

@@ -29,7 +29,12 @@ jobs:
2929
artifactory_user: ${{ vars.ARTIFACTORY_USER }}
3030
artifactory_password: ${{ secrets.ARTIFACTORY_PASSWORD }}
3131

32-
- name: Deployment test
32+
- name: Helm tests
33+
uses: ./.github/actions/nix/run_bash_command_in_nix
34+
with:
35+
cmd: make cluster/helm/test
36+
37+
- name: Pulumi tests
3338
uses: ./.github/actions/nix/run_bash_command_in_nix
3439
with:
3540
cmd_retry_count: 5 # Retry in case of dependency download errors

‎.github/workflows/build.docs.yml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
docs:
1212
runs-on: self-hosted-k8s-small
1313
container:
14-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-ci:0.3.12
14+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-ci:0.3.12
1515

1616
steps:
1717

@@ -38,29 +38,30 @@ jobs:
3838
# as it finishes fastest and we want to ensure that it includes test sources.
3939
cmd: "Test/compile docs/bundle"
4040

41-
- name: Push documentation
42-
uses: ./.github/actions/nix/run_bash_command_in_nix
43-
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
44-
env:
45-
GH_USER: ${{ github.actor }}
46-
GH_TOKEN: ${{ secrets.GH_ISSUES }}
47-
with:
48-
additional_nix_args: "--keep GH_USER --keep GH_TOKEN"
49-
cmd: |
50-
REPO_DIR="$(mktemp -d)"
51-
export GIT_SSH_COMMAND="/usr/bin/ssh"
52-
git config --global user.email "splice-maintainers@digitalasset.com"
53-
git config --global user.name "DA Automation"
54-
git clone https://$GH_USER:$GH_TOKEN@github.com/digital-asset/decentralized-canton-sync.git "$REPO_DIR" -b docs
55-
# Given that we just wanna overwrite anything an rm + cp seems more straightforward than an rsync.
56-
rm -rf "$REPO_DIR/docs"
57-
cp -r "docs/html/html" "$REPO_DIR/docs"
58-
# Required to make GH service the _static directory properly.
59-
touch "$REPO_DIR/docs/.nojekyll"
60-
cd "$REPO_DIR"
61-
git add .
62-
git commit -m 'Update documentation'
63-
git push origin docs
41+
# TODO(#1028): Reenable this
42+
# - name: Push documentation
43+
# uses: ./.github/actions/nix/run_bash_command_in_nix
44+
# if: github.ref == 'refs/heads/main' && github.event_name == 'push'
45+
# env:
46+
# GH_USER: ${{ github.actor }}
47+
# GH_TOKEN: ${{ secrets.GH_ISSUES }}
48+
# with:
49+
# additional_nix_args: "--keep GH_USER --keep GH_TOKEN"
50+
# cmd: |
51+
# REPO_DIR="$(mktemp -d)"
52+
# export GIT_SSH_COMMAND="/usr/bin/ssh"
53+
# git config --global user.email "splice-maintainers@digitalasset.com"
54+
# git config --global user.name "DA Automation"
55+
# git clone https://$GH_USER:$GH_TOKEN@github.com/digital-asset/decentralized-canton-sync.git "$REPO_DIR" -b docs
56+
# # Given that we just wanna overwrite anything an rm + cp seems more straightforward than an rsync.
57+
# rm -rf "$REPO_DIR/docs"
58+
# cp -r "docs/html/html" "$REPO_DIR/docs"
59+
# # Required to make GH service the _static directory properly.
60+
# touch "$REPO_DIR/docs/.nojekyll"
61+
# cd "$REPO_DIR"
62+
# git add .
63+
# git commit -m 'Update documentation'
64+
# git push origin docs
6465

6566
- name: Post-SBT job
6667
uses: ./.github/actions/sbt/post_sbt

‎.github/workflows/build.scala_test.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ on:
3030
type: string
3131
required: false
3232
default: ""
33+
run_if_commit_tag:
34+
type: string
35+
required: false
36+
default: ""
3337
skip_if_files_changed:
3438
type: string
3539
required: false
@@ -72,6 +76,7 @@ jobs:
7276
test_names_file: ${{ inputs.test_names_file }}
7377
skip_if_regex: ${{ inputs.skip_if_regex }}
7478
skip_if_files_changed: ${{ inputs.skip_if_files_changed }}
79+
run_if_commit_tag: ${{ inputs.run_if_commit_tag }}
7580

7681
scala_test:
7782
runs-on: ${{ inputs.runs_on }}
@@ -88,11 +93,11 @@ jobs:
8893
runner-index: ${{ fromjson(needs.split_tests.outputs.indices) }}
8994
fail-fast: false
9095
container:
91-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-ci:0.3.12
96+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-ci:0.3.12
9297

9398
services:
9499
postgres:
95-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-postgres:0.3.12
100+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-postgres:0.3.12
96101
env:
97102
POSTGRES_PASSWORD: postgres
98103

‎.github/workflows/build.scala_test_for_compose.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
start_canton_options:
66
type: string
77
required: true
8+
with_canton:
9+
type: boolean
10+
required: false
11+
default: true
812
runs_on:
913
type: string
1014
required: true
@@ -61,7 +65,7 @@ jobs:
6165

6266
services:
6367
postgres:
64-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-postgres:0.3.12
68+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-postgres:0.3.12
6569
env:
6670
POSTGRES_PASSWORD: postgres
6771
ports:
@@ -94,3 +98,4 @@ jobs:
9498
failure_notifications_invoker_sa: ${{ secrets.FAILURE_NOTIFICATIONS_INVOKER_SA }}
9599
failure_notifications_invoker_url: ${{ secrets.FAILURE_NOTIFICATIONS_INVOKER_URL }}
96100
failure_notifications_slack_channel: ${{ secrets.FAILURE_NOTIFICATIONS_SLACK_CHANNEL }}
101+
with_canton: ${{ inputs.with_canton }}

‎.github/workflows/build.scala_test_with_cometbft.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,40 +57,40 @@ jobs:
5757
runner-index: ${{ fromjson(needs.split_tests.outputs.indices) }}
5858
fail-fast: false
5959
container:
60-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-ci:0.3.12
60+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-ci:0.3.12
6161

6262
services:
6363
postgres:
64-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-postgres:0.3.12
64+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-postgres:0.3.12
6565
env:
6666
POSTGRES_PASSWORD: postgres
6767

6868
cometbft1:
69-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-cometbft:0.3.12
69+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-cometbft:0.3.12
7070
env:
7171
sv_idx: 1
7272
options: --name cometbft1
7373

7474
cometbft2:
75-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-cometbft:0.3.12
75+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-cometbft:0.3.12
7676
env:
7777
sv_idx: 2
7878
options: --name cometbft2
7979

8080
cometbft2Local:
81-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-cometbft:0.3.12
81+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-cometbft:0.3.12
8282
env:
8383
sv_idx: 2Local
8484
options: --name cometbft2local
8585

8686
cometbft3:
87-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-cometbft:0.3.12
87+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-cometbft:0.3.12
8888
env:
8989
sv_idx: 3
9090
options: --name cometbft3
9191

9292
cometbft4:
93-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-cometbft:0.3.12
93+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-cometbft:0.3.12
9494
env:
9595
sv_idx: 4
9696
options: --name cometbft4

‎.github/workflows/build.static_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: self-hosted-k8s-small
1414
timeout-minutes: 35
1515
container:
16-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-ci:0.3.12
16+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-ci:0.3.12
1717

1818
steps:
1919

‎.github/workflows/build.ui_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
ui_tests:
1212
runs-on: self-hosted-k8s-small
1313
container:
14-
image: ghcr.io/digital-asset/decentralized-canton-sync/docker/splice-test-ci:0.3.12
14+
image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-ci:0.3.12
1515

1616
steps:
1717

0 commit comments

Comments
 (0)