From 1207ce497fc83674773a630382854313524940e9 Mon Sep 17 00:00:00 2001
From: CkTi <ckti@i2pmail.org>
Date: Wed, 31 Mar 2021 14:45:05 +0100
Subject: [PATCH] Update to run circleci with github, add in focal build

---
 .circleci/config.yml       | 38 ++++++++++++++++++++++++++++++++------
 .travis/lint_04_install.sh |  6 +++---
 .travis/lint_06_script.sh  |  2 +-
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 68e35d1d11509..3d4326e64b11d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
         command: |
             apt-get -y update
             apt-get -y install python-pip
-            git clone --depth 1 https://bitbucket.org/ioncoin/ion .
+            git clone --depth 1 https://github.com/ioncoincore/ion .
             source .travis/lint_04_install.sh
             source .travis/lint_05_before_script.sh
             # LevelDB
@@ -26,12 +26,12 @@ jobs:
             # univalue
             git remote add -f univalue https://github.com/jgarzik/univalue
             # snap
-            git remote add -f snap  https://github.com/ioncoincore/ion
+            #git remote add -f snap  https://github.com/ioncoincore/ion
             git rm -rf src/leveldb
             git rm -rf src/secp256k1
             git rm -rf src/crypto/ctaes
             git rm -rf src/univalue
-            git rm -rf snap
+            #git rm -rf snap
             git add .
             git config --global user.email "lint@dev.null"
             git config --global user.name "Lint Check"
@@ -45,7 +45,7 @@ jobs:
             # univalue
             git subtree add --prefix src/univalue univalue 9f0b9975925b202ab130714e5422f8dd8bf40ac3 --squash
             # snap
-            git subtree add --prefix snap snap snap --squash
+            #git subtree add --prefix snap snap snap --squash
             source .travis/lint_06_script.sh
   x86_64_bionic:
     docker:
@@ -73,6 +73,28 @@ jobs:
             python3 setup.py install
             cd -
             test/functional/test_runner.py
+  x86_64_focal:
+    docker:
+      - image: circleci/buildpack-deps:focal
+        user: root
+    environment:
+      HOST: x86_64-linux-gnu
+      JOBS: 4
+    steps:
+      - checkout
+      - run:
+          command: |
+            git submodule update --init --recursive
+            apt-get -y update
+            apt-get -y install pkg-config autoconf libtool automake bsdmainutils ca-certificates python3 cmake libxkbcommon0 gcc-8 g++-8 libpython3.9-dev python3-distutils
+            update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 100
+            update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 100
+            update-alternatives --install /usr/bin/${HOST}-gcc ${HOST}-gcc /usr/bin/${HOST}-gcc-8 100
+            update-alternatives --install /usr/bin/${HOST}-g++ ${HOST}-g++ /usr/bin/${HOST}-g++-8 100
+            make -j${JOBS} -C depends HOST=${HOST}
+            ./autogen.sh
+            ./configure --host=${HOST} --prefix=`pwd`/depends/${HOST} --enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++
+            make -j${JOBS}
   i686_bionic:
     docker:
       - image: ioncoin/gitian:latest
@@ -118,7 +140,7 @@ jobs:
             make install
             cd ../..
             ./autogen.sh
-            ./configure --host=${HOST} --prefix=/ --enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --disable-hardening --disable-asm
+            ./configure --host=${HOST} --prefix=/ --enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --disable-hardening --disable-asm --disable-tests
             make -j${JOBS}
   arm32_bionic:
     docker:
@@ -226,7 +248,8 @@ jobs:
             tar -C `pwd`/depends/SDKs -xJf ./MacOSX10.11.sdk.tar.xz
             make -j${JOBS} -C depends HOST=${HOST}
             ./autogen.sh
-            ./configure --host=${HOST} --prefix=`pwd`/depends/${HOST} --enable-reduce-exports --enable-werror --disable-ccache --disable-maintainer-mode --disable-dependency-tracking
+            ./configure --host=${HOST} --prefix=`pwd`/depends/${HOST} --enable-reduce-exports --enable-werror --disable-ccache --disable-maintainer-mode --disable-dependency-tracking --disable-bench --disable-gui-tests
+
             make -j${JOBS}
   snapcraft_build:
     docker:
@@ -249,6 +272,9 @@ workflows:
       - x86_64_xenial:
           requires:
             - lint_all
+      - x86_64_focal:
+          requires:
+            - lint_all
       - arm32_bionic:
           requires:
             - lint_all
diff --git a/.travis/lint_04_install.sh b/.travis/lint_04_install.sh
index 16b44aeffb9ba..2f7d7ff19f91c 100755
--- a/.travis/lint_04_install.sh
+++ b/.travis/lint_04_install.sh
@@ -6,9 +6,9 @@
 
 export LC_ALL=C
 
-pip install codespell==1.13.0
-pip install flake8==3.5.0
-pip install vulture==0.29
+pip2 install codespell==1.13.0
+pip2 install flake8==3.5.0
+pip2 install vulture==0.29
 
 SHELLCHECK_VERSION=v0.6.0
 curl -s "https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
diff --git a/.travis/lint_06_script.sh b/.travis/lint_06_script.sh
index 127addf345abc..97be7c8183132 100755
--- a/.travis/lint_06_script.sh
+++ b/.travis/lint_06_script.sh
@@ -10,7 +10,7 @@ contrib/devtools/git-subtree-check.sh src/leveldb
 contrib/devtools/git-subtree-check.sh src/secp256k1
 contrib/devtools/git-subtree-check.sh src/crypto/ctaes
 contrib/devtools/git-subtree-check.sh src/univalue
-contrib/devtools/git-subtree-check.sh snap
+#contrib/devtools/git-subtree-check.sh snap
 
 # Fails with error 10 as not all commands are documented
 #contrib/devtools/check-doc.py