Skip to content

Commit

Permalink
Merge branch 'main' into fix-docker-demo
Browse files Browse the repository at this point in the history
  • Loading branch information
nomaxg authored Mar 28, 2024
2 parents 35ecbe5 + d0ccb9e commit 4ddfaef
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 4 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@ jobs:
target/release/keygen
build-arm:
runs-on: [self-hosted, ARM64]
container:
image: ghcr.io/espressosystems/devops-rust:stable
runs-on: buildjet-4vcpu-ubuntu-2204-arm
steps:
- name: Fix submodule permissions check
run: |
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/check-demo-consistency.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Fails if process-compose is edited but not docker-compose
name: Check Demo Consistency

on:
pull_request:
paths:
- 'process-compose.yaml'
- 'docker-compose.yaml'

jobs:
check-edits:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 2

- name: Check for file edits
run: |
git fetch origin main
FILES_CHANGED=$(git diff --name-only origin/main..HEAD)
# Check if process-compose.yaml is edited
if echo "$FILES_CHANGED" | grep "process-compose.yaml"; then
# Fail if docker-compose.yml is not also edited
if ! echo "$FILES_CHANGED" | grep "docker-compose.yaml"; then
echo "process-compose.yaml is edited but not docker-compose.yaml"
echo "If this was intentional, you may ignore this failure"
exit 1
fi
fi
2 changes: 1 addition & 1 deletion process-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ processes:
exec:
command: "[ $(docker inspect -f '{{.State.Health.Status}}' espresso-sequencer-demo-l1-network-1) = 'healthy' ]"
initial_delay_seconds: 5
period_seconds: 5
period_seconds: 6
timeout_seconds: 5
success_threshold: 1
failure_threshold: 20
Expand Down

0 comments on commit 4ddfaef

Please sign in to comment.