From 5a4c2d0a2b89181373755696af17d20456524be5 Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Sat, 17 Sep 2022 07:38:18 +0200
Subject: [PATCH] move i386 testing to nightlies + remove testing of Nim 1.4
 (#4103)

* remove i386 target from ci.yml

* add i386 build to nightlies.yml

* don't continue on error for Nim 1.6

* do not test Nim 1.4
---
 .github/workflows/ci.yml            | 39 ------------------------
 .github/workflows/cron.yml          |  4 +--
 .github/workflows/nightly_build.yml | 46 +++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9e3c88439..4a62e9088 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,8 +18,6 @@ jobs:
         target:
           - os: linux
             cpu: amd64
-          - os: linux
-            cpu: i386
           - os: macos
             cpu: amd64
           - os: windows
@@ -70,37 +68,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install build dependencies (Linux i386)
-        if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt-fast update -qq
-          sudo DEBIAN_FRONTEND='noninteractive' apt-fast install \
-            --no-install-recommends -yq gcc-multilib g++-multilib
-          mkdir -p external/bin
-          cat << EOF > external/bin/gcc
-          #!/bin/bash
-          exec $(which gcc) -m32 -mno-adx "\$@"
-          EOF
-          cat << EOF > external/bin/g++
-          #!/bin/bash
-          exec $(which g++) -m32 -mno-adx "\$@"
-          EOF
-          chmod 755 external/bin/gcc external/bin/g++
-          echo "${{ github.workspace }}/external/bin" >> $GITHUB_PATH
-
-      - name: MSYS2 (Windows i386)
-        if: runner.os == 'Windows' && matrix.target.cpu == 'i386'
-        uses: msys2/setup-msys2@v2
-        with:
-          path-type: inherit
-          msystem: MINGW32
-          install: >-
-            base-devel
-            git
-            mingw-w64-i686-toolchain
-            mingw-w64-i686-cmake
-
       - name: MSYS2 (Windows amd64)
         if: runner.os == 'Windows' && matrix.target.cpu == 'amd64'
         uses: msys2/setup-msys2@v2
@@ -158,12 +125,6 @@ jobs:
             echo "NIMFLAGS=${NIMFLAGS}" >> $GITHUB_ENV
           fi
 
-          # libminiupnp / natpmp
-          if [[ '${{ runner.os }}' == 'Linux' && '${{ matrix.target.cpu }}' == 'i386' ]]; then
-            export CFLAGS="${CFLAGS} -m32 -mno-adx"
-            echo "CFLAGS=${CFLAGS}" >> $GITHUB_ENV
-          fi
-
           ncpu=""
           make_cmd="make"
           case '${{ runner.os }}' in
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 083ddef32..48313cbb4 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -21,7 +21,7 @@ jobs:
             cpu: amd64
           - os: windows
             cpu: i386
-        branch: [version-1-2, version-1-4, version-1-6, devel]
+        branch: [version-1-2, version-1-6, devel]
         include:
           - target:
               os: linux
@@ -42,7 +42,7 @@ jobs:
 
     name: '${{ matrix.target.os }}-${{ matrix.target.cpu }} (Nim ${{ matrix.branch }})'
     runs-on: ${{ matrix.builder }}
-    continue-on-error: ${{ matrix.branch == 'version-1-6' || matrix.branch == 'devel' }}
+    continue-on-error: ${{ matrix.branch == 'devel' }}
     steps:
       - name: Checkout
         if: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml
index 7bc1f8fc6..f95103271 100644
--- a/.github/workflows/nightly_build.yml
+++ b/.github/workflows/nightly_build.yml
@@ -56,6 +56,52 @@ jobs:
           path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
           retention-days: 2
 
+  build-i386:
+    name: Linux i386 release asset
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: unstable
+
+      - name: Build project
+        id: make_dist
+        run: |
+          make dist-i386
+          cd dist
+          ARCHIVE=$(echo *.tar.gz)
+          tar -xzf ${ARCHIVE}
+          NEW_ARCHIVE_DIR="nimbus-eth2_Linux_i386_$(date +%Y%m%d)_$(git rev-parse --short=8 HEAD)"
+          mv ${ARCHIVE%.tar.gz} ${NEW_ARCHIVE_DIR}
+          tar -czf ${NEW_ARCHIVE_DIR}.tar.gz ${NEW_ARCHIVE_DIR}
+          cp ${NEW_ARCHIVE_DIR}.tar.gz nimbus-eth2_Linux_i386_nightly_latest.tar.gz
+          echo "::set-output name=archive::"${NEW_ARCHIVE_DIR}.tar.gz
+          echo "::set-output name=archive_dir::"${NEW_ARCHIVE_DIR}
+
+      - name: Upload archive artefact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Linux_i386_archive
+          path: |
+            ./dist/${{ steps.make_dist.outputs.archive }}
+            ./dist/nimbus-eth2_Linux_i386_nightly_latest.tar.gz
+          retention-days: 2
+
+      - name: Upload BN checksum artefact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Linux_i386_checksum
+          path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
+          retention-days: 2
+
+      - name: Upload VC checksum artefact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Linux_i386_checksum
+          path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
+          retention-days: 2
+
   build-arm64:
     name: Linux ARM64 release asset
     runs-on: ubuntu-latest