From e3b2eb3e4b9fd78a66302829bc62df0a1c671140 Mon Sep 17 00:00:00 2001
From: Roman Zeyde <me@romanzey.de>
Date: Thu, 29 Jun 2023 19:50:11 +0300
Subject: [PATCH] Run x86 integration tests in GitHub actions

---
 .cirrus.yml                | 16 ++++++++--------
 .github/workflows/rust.yml | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 4fa1aa8..3c7614a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -32,11 +32,11 @@ task:
   test_script:
     tests/run.sh
 
-task:
-  name: integration [x86]
-  container:
-    dockerfile: Dockerfile.ci
-    docker_arguments:
-      ARCH: x86_64
-  test_script:
-    tests/run.sh
+# task:
+#   name: integration [x86]
+#   container:
+#     dockerfile: Dockerfile.ci
+#     docker_arguments:
+#       ARCH: x86_64
+#   test_script:
+#     tests/run.sh
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3949c6d..80d87b0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -42,13 +42,13 @@ jobs:
       - name: Clippy
         run: cargo clippy -- -D warnings
 
-  # integration:
-  #   name: Integration
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Build
-  #       run: docker build -f Dockerfile.ci . --rm -t electrs:tests
-  #     - name: Test
-  #       run: docker run -v $PWD/contrib/:/contrib -v $PWD/tests/:/tests --rm electrs:tests bash /tests/run.sh
+  integration:
+    name: Integration
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build
+        run: docker build -f Dockerfile.ci . --rm -t electrs:tests
+      - name: Test
+        run: docker run -v $PWD/contrib/:/contrib -v $PWD/tests/:/tests --rm electrs:tests bash /tests/run.sh