From 590cb13115808b751a16c0a331613a1a42f627cb Mon Sep 17 00:00:00 2001
From: Guilherme Janczak <guilherme.janczak@yandex.com>
Date: Wed, 31 Jan 2024 02:43:18 +0000
Subject: [PATCH] switch termux docker image provider to a maintained one

---
 .cirrus.yml                          | 10 ----------
 .github/workflows/build-and-test.yml | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index d4c98a5..d30882e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -69,13 +69,3 @@ task:
   setup_script:
     - pkg install -y meson ninja gcc
   << : *common_script
-
-task:
-  container:
-    image: kcubeterm/termux:x86_64
-    kvm: true
-  name: bionic
-  setup_script:
-    - pkg install -y ninja clang python
-    - pip install meson
-  << : *common_script
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 2069984..edb0075 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -19,6 +19,32 @@ on: [push, pull_request]
 # copypasted between jobs. You'll probably want to read the 'glibc:' task first,
 # it's the one that requires the least hacks.
 jobs:
+  bionic:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: docker run -t --rm termux/termux-docker:latest bash {0}
+    steps:
+      - name: setup docker
+        uses: docker://docker.io/termux/termux-docker:latest
+      - name: setup
+        run: |
+          pkg install -y ninja clang python
+          pip install meson
+      - uses: actions/checkout@v3.3.0
+      - name: build
+        run: |
+          meson setup -Db_sanitize=address,undefined -Dtest_system=true build
+          meson compile -C build
+      - name: test
+        run: meson test --no-suite system -C build
+      - name: test_system
+        run: meson test --suite system -C build || true
+      - uses: actions/upload-artifact@v3.1.2
+        if: always()
+        with:
+          name: meson-logs-bionic
+          path: build/meson-logs
   dietlibc:
     runs-on: ubuntu-latest
     steps: