Skip to content

Commit 6c06174

Browse files
committed
Merge branch 'master' of github.com:input-output-hk/partner-chains into upgrade_with_beefy_testing
2 parents 310692c + 6306d00 commit 6c06174

File tree

56 files changed

+1507
-1081
lines changed

Some content is hidden

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

56 files changed

+1507
-1081
lines changed

.github/actions/deploy/argocd/manifest.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ spec:
2929
memory: "4096Mi"
3030
cpu: "1000m"
3131
env:
32+
- name: CARDANO_DATA_SOURCE
33+
value: "db-sync"
3234
- name: DB_SYNC_POSTGRES_CONNECTION_STRING
3335
value: "postgres://postgres:[email protected]:5432/cexplorer"
3436
- name: CARDANO_SECURITY_PARAMETER

.github/workflows/ci.yml

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ jobs:
3636
with:
3737
fetch-depth: 0
3838
clean: true
39+
- name: Acquire cache lock
40+
run: |
41+
until mkdir /tmp/rust-cache.lock 2>/dev/null; do
42+
sleep 5
43+
done
3944
- name: Restore Rust cache from host
4045
run: |
4146
set -e
@@ -51,6 +56,9 @@ jobs:
5156
else
5257
echo "No Rust cache found. Will be created after build."
5358
fi
59+
- name: Release cache lock
60+
if: always()
61+
run: rmdir /tmp/rust-cache.lock
5462
- name: Acquire AWS credentials
5563
uses: aws-actions/configure-aws-credentials@v4
5664
with:
@@ -68,6 +76,11 @@ jobs:
6876
run: nix develop -c bash -c "ls"
6977
- name: Formatting
7078
run: nix develop -c bash -c "ls"
79+
- name: Acquire cache lock
80+
run: |
81+
until mkdir /tmp/rust-cache.lock 2>/dev/null; do
82+
sleep 5
83+
done
7184
- name: Save Rust cache to host
7285
if: always()
7386
run: |
@@ -81,6 +94,9 @@ jobs:
8194
"
8295
echo "--- Verifying cache contents ---"
8396
ls -laR /tmp/rust-cache
97+
- name: Release cache lock
98+
if: always()
99+
run: rmdir /tmp/rust-cache.lock
84100
#- name: Run cargo-deny to check licenses
85101
# uses: EmbarkStudios/cargo-deny-action@v1
86102
# with:
@@ -199,7 +215,7 @@ jobs:
199215
upload-chain-specs-pre-merge:
200216
if: github.event_name == 'pull_request' && github.event.pull_request.merged == false
201217
needs: build-linux-x86_64-pre-merge
202-
runs-on: eks
218+
runs-on: ubuntu-latest
203219
steps:
204220
- name: Checkout
205221
uses: actions/checkout@v4
@@ -253,6 +269,11 @@ jobs:
253269
fetch-depth: 0
254270
ref: master
255271
clean: true
272+
- name: Acquire cache lock
273+
run: |
274+
until mkdir /tmp/rust-cache.lock 2>/dev/null; do
275+
sleep 5
276+
done
256277
- name: Restore Rust cache from host
257278
run: |
258279
set -e
@@ -268,6 +289,9 @@ jobs:
268289
else
269290
echo "No Rust cache found. Will be created after build."
270291
fi
292+
- name: Release cache lock
293+
if: always()
294+
run: rmdir /tmp/rust-cache.lock
271295
- name: Get current commit SHA
272296
id: get_sha
273297
run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
@@ -309,6 +333,11 @@ jobs:
309333
docker push ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ steps.get_sha.outputs.sha }}
310334
docker push ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:latest
311335
docker push ghcr.io/${{ github.repository }}/partner-chains-node-unstable:latest
336+
- name: Acquire cache lock
337+
run: |
338+
until mkdir /tmp/rust-cache.lock 2>/dev/null; do
339+
sleep 5
340+
done
312341
- name: Save Rust cache to host
313342
if: always()
314343
run: |
@@ -322,6 +351,9 @@ jobs:
322351
"
323352
echo "--- Verifying cache contents ---"
324353
ls -laR /tmp/rust-cache
354+
- name: Release cache lock
355+
if: always()
356+
run: rmdir /tmp/rust-cache.lock
325357
- name: Rename artifact
326358
run: |
327359
cp ./partner-chains-demo-node partner-chains-node-${{ steps.get_sha.outputs.sha }}-x86_64-linux
@@ -381,7 +413,7 @@ jobs:
381413
upload-chain-specs:
382414
if: github.event_name == 'pull_request' && github.event.pull_request.merged == true
383415
needs: build-linux-x86_64-post-merge
384-
runs-on: eks
416+
runs-on: ubuntu-latest
385417
steps:
386418
- name: Checkout
387419
uses: actions/checkout@v4
@@ -418,7 +450,7 @@ jobs:
418450
permissions:
419451
id-token: write
420452
contents: write
421-
runs-on: eks
453+
runs-on: ubuntu-latest
422454
steps:
423455
- name: Checkout
424456
uses: actions/checkout@v4
@@ -506,6 +538,11 @@ jobs:
506538
fetch-depth: 0
507539
ref: ${{ inputs.sha }}
508540
clean: true
541+
- name: Acquire cache lock
542+
run: |
543+
until mkdir /tmp/rust-cache.lock 2>/dev/null; do
544+
sleep 5
545+
done
509546
- name: Restore Rust cache from host
510547
run: |
511548
set -e
@@ -521,6 +558,9 @@ jobs:
521558
else
522559
echo "No Rust cache found. Will be created after build."
523560
fi
561+
- name: Release cache lock
562+
if: always()
563+
run: rmdir /tmp/rust-cache.lock
524564
- name: Acquire AWS credentials
525565
uses: aws-actions/configure-aws-credentials@v4
526566
with:
@@ -538,6 +578,11 @@ jobs:
538578
run: nix develop -c bash -c "RUSTFLAGS=-Dwarnings cargo clippy --all-targets --all-features"
539579
- name: Formatting
540580
run: nix develop -c bash -c "cargo fmt --check"
581+
- name: Acquire cache lock
582+
run: |
583+
until mkdir /tmp/rust-cache.lock 2>/dev/null; do
584+
sleep 5
585+
done
541586
- name: Save Rust cache to host
542587
if: always()
543588
run: |
@@ -551,6 +596,9 @@ jobs:
551596
"
552597
echo "--- Verifying cache contents ---"
553598
ls -laR /tmp/rust-cache
599+
- name: Release cache lock
600+
if: always()
601+
run: rmdir /tmp/rust-cache.lock
554602
#- name: Run cargo-deny to check licenses
555603
# uses: EmbarkStudios/cargo-deny-action@v1
556604
# with:
@@ -618,7 +666,7 @@ jobs:
618666
upload-chain-specs-workflow-dispatch:
619667
if: github.event_name == 'workflow_dispatch'
620668
needs: build-linux-x86_64-workflow-dispatch
621-
runs-on: eks
669+
runs-on: ubuntu-latest
622670
steps:
623671
- name: Checkout specific SHA
624672
uses: actions/checkout@v4
@@ -648,4 +696,4 @@ jobs:
648696
exit 1
649697
else
650698
echo "All needed jobs passed."
651-
fi
699+
fi

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ substrate-prometheus-endpoint = { package = "substrate-prometheus-endpoint", git
263263
substrate-test-runtime-client = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2506" }
264264
substrate-wasm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2506" }
265265

266-
raw-scripts = { git = "https://github.com/input-output-hk/partner-chains-smart-contracts.git", tag = "v7.2.2" }
266+
raw-scripts = { git = "https://github.com/input-output-hk/partner-chains-smart-contracts.git", tag = "v8.0.0" }
267267
# local dependencies
268268

269269
# utils

0 commit comments

Comments
 (0)