Merge branch 'main' into fix/tsup-config

FuelLabs · Sep 19, 2024 · eff7090 · eff7090
2 parents 0fc7d9c + de929ab
commit eff7090
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
@@ -16,6 +16,7 @@ jobs:
   tests-e2e:
     name: E2E Tests
     runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 15
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -39,6 +40,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Start Test Node
+        timeout-minutes: 7
         run: pnpm node:start
 
       # E2E tests running with Playwright
@@ -60,6 +62,7 @@ jobs:
   tests-e2e-soft:
     name: E2E Tests Soft
     runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 10
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -83,6 +86,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Start Test Node
+        timeout-minutes: 7
         run: pnpm node:start
 
       # E2E tests running with Playwright

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -13,6 +13,11 @@ services:
       # expose the service to the host for integration testing
       - 8545:9545
       - ${DEPLOYMENTS_PORT:-8080}:8081
+    healthcheck:
+      test: "curl -f -H \"Content-Type: application/json\" -d '{\"jsonrpc\":\"2.0\",\"id\":0,\"method\":\"net_version\",\"params\":[]}' http://localhost:9545 || exit 1"
+      interval: 5s
+      timeout: 2s
+      retries: 10000
     networks:
       - app-network
 
@@ -24,7 +29,7 @@ services:
     platform: linux/amd64
     depends_on:
       l1_chain:
-        condition: service_started
+        condition: service_healthy
     build:
       context: ./fuel-core/
     environment:
@@ -35,9 +40,9 @@ services:
       - ${FUEL_CORE_HTTP_PORT:-4000}:4001
     healthcheck:
       test: curl --fail http://localhost:4001/v1/health || exit 1
-      interval: 10s
-      timeout: 10s
-      retries: 100
+      interval: 4s
+      timeout: 3s
+      retries: 200
     networks:
       - app-network
 

diff --git a/docker/fuel-core/Dockerfile b/docker/fuel-core/Dockerfile
@@ -14,9 +14,12 @@ WORKDIR /fuel
 
 COPY ./genesis_coins.json .
 
+#  Fuel Core 0.35.0, needs to be changed when core version is updated
 RUN git clone \
     https://github.com/FuelLabs/chain-configuration.git \
-    /chain-configuration
+    /chain-configuration && \
+    cd /chain-configuration && \
+    git checkout 6cea45da59bb105a02fb0b115c7ef03f3a690ba1
 
 # Copy the base local configuration
 RUN cp -R /chain-configuration/local/* ./