From 05cc3820735fd3253ae728a26d3f79c5ea464b1a Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@airmail.cc>
Date: Wed, 17 Feb 2021 18:46:13 +0000
Subject: [PATCH] Cirrus: Add linux-i686 target

---
 .cirrus.yml             | 103 ++++++++++++++++++++++++++++++++++++++++
 tools/cirrus_gen_yml.sh |  15 ++++--
 2 files changed, 113 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7a27939..7134e50 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -101,3 +101,106 @@ release_linux_x86_64_ncprop279_docker_builder:
   depends_on:
     - "release_linux_x86_64_ncp11"
 
+release_linux_i686_download_docker_builder:
+  timeout_in: 120m
+  out_release_linux_i686_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  git_release_linux_i686_cache:
+    folder: git_clones
+    fingerprint_script:
+      - "echo git_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p git_clones"
+  build_script:
+    - "./tools/cirrus_build_project.sh ncdns release linux i686 0"
+
+release_linux_i686_goeasyconfig_docker_builder:
+  timeout_in: 120m
+  out_release_linux_i686_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  git_release_linux_i686_cache:
+    folder: git_clones
+    fingerprint_script:
+      - "echo git_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p git_clones"
+  build_script:
+    - "./tools/cirrus_build_project.sh goeasyconfig release linux i686 1"
+  depends_on:
+    - "release_linux_i686_download"
+
+release_linux_i686_ncdns_docker_builder:
+  timeout_in: 120m
+  out_release_linux_i686_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  git_release_linux_i686_cache:
+    folder: git_clones
+    fingerprint_script:
+      - "echo git_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p git_clones"
+  build_script:
+    - "./tools/cirrus_build_project.sh ncdns release linux i686 1"
+  depends_on:
+    - "release_linux_i686_goeasyconfig"
+
+release_linux_i686_ncp11_docker_builder:
+  timeout_in: 120m
+  out_release_linux_i686_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  git_release_linux_i686_cache:
+    folder: git_clones
+    fingerprint_script:
+      - "echo git_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p git_clones"
+  build_script:
+    - "./tools/cirrus_build_project.sh ncp11 release linux i686 1"
+  depends_on:
+    - "release_linux_i686_ncdns"
+
+release_linux_i686_ncprop279_docker_builder:
+  timeout_in: 120m
+  out_release_linux_i686_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  git_release_linux_i686_cache:
+    folder: git_clones
+    fingerprint_script:
+      - "echo git_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p git_clones"
+  build_script:
+    - "./tools/cirrus_build_project.sh ncprop279 release linux i686 1"
+  depends_on:
+    - "release_linux_i686_ncp11"
+
diff --git a/tools/cirrus_gen_yml.sh b/tools/cirrus_gen_yml.sh
index 7a3f302..d1b8351 100755
--- a/tools/cirrus_gen_yml.sh
+++ b/tools/cirrus_gen_yml.sh
@@ -3,10 +3,9 @@
 set -euxo pipefail
 shopt -s nullglob globstar
 
-(
-for CHANNEL in release; do
-    OS=linux
-    ARCH=x86_64
+print_os_arch () {
+    local OS="$1"
+    local ARCH="$2"
 
     # Pre-download tarballs and Git repos
     echo "${CHANNEL}_${OS}_${ARCH}_download_docker_builder:
@@ -59,9 +58,15 @@ for CHANNEL in release; do
     - \"${CHANNEL}_${OS}_${ARCH}_${PREV_PROJECT}\""
         fi
 
-        PREV_PROJECT="$PROJECT"
+        local PREV_PROJECT="$PROJECT"
         echo ""
     done
+}
+
+(
+for CHANNEL in release; do
+    print_os_arch linux x86_64
+    print_os_arch linux i686
 done
 ) > .cirrus.yml