From c45e129cfba27b593f9dfd4ac88600a426f2f5dd Mon Sep 17 00:00:00 2001 From: lightspeed393 Date: Tue, 30 Mar 2021 15:16:08 -0400 Subject: [PATCH 1/8] Update spacecoin addnodes. --- src/komodo_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index f6c24c37..1ef1d171 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1765,7 +1765,7 @@ void komodo_args(char *argv0) SoftSetArg("-ac_cbmaturity", std::string("1")); SoftSetArg("-ac_cc", std::string("939")); SoftSetArg("-ac_sapling", std::string("1")); - vector SPACEnodes = { "165.227.35.158", "167.172.39.135", "165.22.64.156", "188.166.221.247", "164.90.145.140", "188.40.53.201", "94.130.38.173" }; + vector SPACEnodes = { "explorer.spaceworks.co", "mining.spaceworks.co", "space-node.nextblu.com", "space.explorer.dexstats.info" }; mapMultiArgs["-addnode"] = SPACEnodes; name = GetArg("-ac_name",""); From a043cc0256815a93a24e0601c9930c44e5f9c298 Mon Sep 17 00:00:00 2001 From: lightspeed393 Date: Tue, 30 Mar 2021 15:24:57 -0400 Subject: [PATCH 2/8] CI: update mac and windows. --- .github/workflows/spacecoin-qt_cd.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/spacecoin-qt_cd.yml b/.github/workflows/spacecoin-qt_cd.yml index 52919d2d..95f1beef 100644 --- a/.github/workflows/spacecoin-qt_cd.yml +++ b/.github/workflows/spacecoin-qt_cd.yml @@ -33,7 +33,7 @@ jobs: - name: Install dependencies (Linux) run: | sudo apt-get update # prevents repo404 errors on apt-remove below - sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm php7.3-common php7.4-fpm msodbcsql17 mysql-server* + sudo apt-get remove php7.4-fpm msodbcsql17 mysql-server* sudo apt-get update sudo ACCEPT_EULA=Y apt-get upgrade -y sudo apt-get install automake autoconf bsdmainutils build-essential clang cmake curl git g++-multilib libboost-all-dev libcurl4-gnutls-dev libc6-dev libdb++-dev libevent-dev libncurses-dev libprotobuf-dev libqrencode-dev libsodium-dev libssl-dev libtool m4 nano ncurses-dev ntp ntpdate pkg-config protobuf-compiler python python-zmq software-properties-common unzip wget zlib1g-dev -y @@ -97,9 +97,6 @@ jobs: brew install protobuf brew install coreutils brew install wget - brew install python3 - brew install berkeley-db4 libtool boost miniupnpc openssl pkg-config python qt libevent qrencode - brew install librsvg - name: Build (macOS) run: | ./zcutil/build-mac.sh -j8 From 268f95b233231feaf11dad83962293133b3303e3 Mon Sep 17 00:00:00 2001 From: lightspeed393 Date: Tue, 30 Mar 2021 15:43:22 -0400 Subject: [PATCH 3/8] Enable CI on ci branch. --- .github/workflows/spacecoin-qt_cd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/spacecoin-qt_cd.yml b/.github/workflows/spacecoin-qt_cd.yml index 95f1beef..20df0b02 100644 --- a/.github/workflows/spacecoin-qt_cd.yml +++ b/.github/workflows/spacecoin-qt_cd.yml @@ -7,6 +7,7 @@ on: branches: - static-spacecoin - static-spacecoin-dev + - static-spacecoin-ci jobs: From 76f6b103d074793f747cdb05b9a73ef6f68120eb Mon Sep 17 00:00:00 2001 From: lightspeed393 Date: Tue, 30 Mar 2021 15:45:45 -0400 Subject: [PATCH 4/8] CI: Remove step removing old php's. --- .github/workflows/spacecoin-qt_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spacecoin-qt_cd.yml b/.github/workflows/spacecoin-qt_cd.yml index 20df0b02..1144d68a 100644 --- a/.github/workflows/spacecoin-qt_cd.yml +++ b/.github/workflows/spacecoin-qt_cd.yml @@ -62,7 +62,7 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | sudo apt-get update # prevents repo404 errors on apt-remove below - sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm php7.3-common php7.4-fpm msodbcsql17 + sudo apt-get remove php7.4-fpm msodbcsql17 sudo apt-get update sudo ACCEPT_EULA=Y apt-get upgrade -y sudo apt-get install automake autoconf bsdmainutils build-essential clang cmake curl git g++-multilib libboost-all-dev libcurl4-gnutls-dev libc6-dev libdb++-dev libevent-dev libncurses-dev libprotobuf-dev libqrencode-dev libsodium-dev libssl-dev libtool mingw-w64 m4 nano ncurses-dev ntp ntpdate pkg-config protobuf-compiler python python-zmq software-properties-common unzip wget zlib1g-dev -y From bb757161670417581f6a23ee09c6441c56602da3 Mon Sep 17 00:00:00 2001 From: lightspeed393 Date: Tue, 30 Mar 2021 15:58:49 -0400 Subject: [PATCH 5/8] CI: install python-zmq after python --- .github/workflows/spacecoin-qt_cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spacecoin-qt_cd.yml b/.github/workflows/spacecoin-qt_cd.yml index 1144d68a..da00d282 100644 --- a/.github/workflows/spacecoin-qt_cd.yml +++ b/.github/workflows/spacecoin-qt_cd.yml @@ -65,8 +65,8 @@ jobs: sudo apt-get remove php7.4-fpm msodbcsql17 sudo apt-get update sudo ACCEPT_EULA=Y apt-get upgrade -y - sudo apt-get install automake autoconf bsdmainutils build-essential clang cmake curl git g++-multilib libboost-all-dev libcurl4-gnutls-dev libc6-dev libdb++-dev libevent-dev libncurses-dev libprotobuf-dev libqrencode-dev libsodium-dev libssl-dev libtool mingw-w64 m4 nano ncurses-dev ntp ntpdate pkg-config protobuf-compiler python python-zmq software-properties-common unzip wget zlib1g-dev -y - sudo apt-get install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools -y + sudo apt-get install automake autoconf bsdmainutils build-essential clang cmake curl git g++-multilib libboost-all-dev libcurl4-gnutls-dev libc6-dev libdb++-dev libevent-dev libncurses-dev libprotobuf-dev libqrencode-dev libsodium-dev libssl-dev libtool mingw-w64 m4 nano ncurses-dev ntp ntpdate pkg-config protobuf-compiler python software-properties-common unzip wget zlib1g-dev -y + sudo apt-get install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools python-zmq -y curl https://sh.rustup.rs -sSf | sh -s -- -y source $HOME/.cargo/env rustup target add x86_64-pc-windows-gnu From 20d82f6d82fdfa3787b816402f966db2ed35de2c Mon Sep 17 00:00:00 2001 From: lightspeed393 Date: Tue, 30 Mar 2021 16:06:55 -0400 Subject: [PATCH 6/8] CI: change windows build to ubuntu 16.04 --- .github/workflows/spacecoin-qt_cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/spacecoin-qt_cd.yml b/.github/workflows/spacecoin-qt_cd.yml index da00d282..ea7e3106 100644 --- a/.github/workflows/spacecoin-qt_cd.yml +++ b/.github/workflows/spacecoin-qt_cd.yml @@ -53,7 +53,7 @@ jobs: windows-build: name: Windows Build (mingw) - runs-on: ubuntu-latest + runs-on: ubuntu-16.04 steps: - uses: actions/checkout@v2 @@ -65,8 +65,8 @@ jobs: sudo apt-get remove php7.4-fpm msodbcsql17 sudo apt-get update sudo ACCEPT_EULA=Y apt-get upgrade -y - sudo apt-get install automake autoconf bsdmainutils build-essential clang cmake curl git g++-multilib libboost-all-dev libcurl4-gnutls-dev libc6-dev libdb++-dev libevent-dev libncurses-dev libprotobuf-dev libqrencode-dev libsodium-dev libssl-dev libtool mingw-w64 m4 nano ncurses-dev ntp ntpdate pkg-config protobuf-compiler python software-properties-common unzip wget zlib1g-dev -y - sudo apt-get install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools python-zmq -y + sudo apt-get install automake autoconf bsdmainutils build-essential clang cmake curl git g++-multilib libboost-all-dev libcurl4-gnutls-dev libc6-dev libdb++-dev libevent-dev libncurses-dev libprotobuf-dev libqrencode-dev libsodium-dev libssl-dev libtool mingw-w64 m4 nano ncurses-dev ntp ntpdate pkg-config protobuf-compiler python python-zmq software-properties-common unzip wget zlib1g-dev -y + sudo apt-get install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools -y curl https://sh.rustup.rs -sSf | sh -s -- -y source $HOME/.cargo/env rustup target add x86_64-pc-windows-gnu From ea5ac23e5484cf6677b2bba12d7f2504e944dc6b Mon Sep 17 00:00:00 2001 From: lightspeed393 Date: Tue, 30 Mar 2021 17:16:57 -0400 Subject: [PATCH 7/8] CI: add macos dependency and change windows to 18.04. --- .github/workflows/spacecoin-qt_cd.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/spacecoin-qt_cd.yml b/.github/workflows/spacecoin-qt_cd.yml index ea7e3106..6b0e6a9d 100644 --- a/.github/workflows/spacecoin-qt_cd.yml +++ b/.github/workflows/spacecoin-qt_cd.yml @@ -53,7 +53,7 @@ jobs: windows-build: name: Windows Build (mingw) - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -98,6 +98,7 @@ jobs: brew install protobuf brew install coreutils brew install wget + brew install gmp - name: Build (macOS) run: | ./zcutil/build-mac.sh -j8 From 7d9d5fec1124c8c7d7a33d5f1a369a968b1715d1 Mon Sep 17 00:00:00 2001 From: lightspeed393 Date: Wed, 31 Mar 2021 12:41:08 -0400 Subject: [PATCH 8/8] CI: update for mac linking. Build: update windows copy. --- .github/workflows/spacecoin-qt_cd.yml | 1 + zcutil/build-win.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/spacecoin-qt_cd.yml b/.github/workflows/spacecoin-qt_cd.yml index 6b0e6a9d..7e72c10b 100644 --- a/.github/workflows/spacecoin-qt_cd.yml +++ b/.github/workflows/spacecoin-qt_cd.yml @@ -99,6 +99,7 @@ jobs: brew install coreutils brew install wget brew install gmp + sudo ln -s /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/* /usr/local/include/ - name: Build (macOS) run: | ./zcutil/build-mac.sh -j8 diff --git a/zcutil/build-win.sh b/zcutil/build-win.sh index 9f9416be..4046202c 100755 --- a/zcutil/build-win.sh +++ b/zcutil/build-win.sh @@ -15,6 +15,6 @@ make -C ${PWD}/depends V=1 HOST=x86_64-w64-mingw32 -j$(nproc --all) CONFIG_SITE="$PWD/depends/x86_64-w64-mingw32/share/config.site" CXXFLAGS="-DCURL_STATICLIB -g0 -O2" ./configure --disable-tests --disable-bench --with-gui=qt5 --disable-bip70 make V=1 -j$(nproc --all) -cd & cd SpaceOcean +cd .. cp src/qt/komodo-qt.exe ./spacecoin-qt.exe