Merge branch 'master' into dev

VerusCoin · May 27, 2021 · f6d1a9e · f6d1a9e
2 parents 2eda5a2 + f612a59
commit f6d1a9e
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -55,9 +55,9 @@ build:linux:
     - rm Verus-CLI-Linux-v${VERUSCOIN_VERSION}-x86_64.tar.gz
     - mkdir -p assets/bin/linux64/komodod
     - mkdir -p assets/bin/linux64/pirated
-    - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/komodo_linux_${KOMODO_VERSION}.tar.gz
-    - tar -xzvf komodo_linux_${KOMODO_VERSION}.tar.gz --strip=1 --directory assets/bin/linux64/komodod
-    - rm komodo_linux_${KOMODO_VERSION}.tar.gz
+    - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/komodo_${KOMODO_VERSION}_linux.zip
+    - unzip -p komodo_${KOMODO_VERSION}_linux.zip | tar -xzvf - --strip=1 --directory assets/bin/linux64/komodod
+    - rm komodo_${KOMODO_VERSION}_linux.zip
     - strip --strip-unneeded  assets/bin/linux64/komodod/komodod && strip --strip-unneeded  assets/bin/linux64/komodod/komodo-cli
     - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-linux-x86_64.tar.gz .
     - tar -xzvf zcashd-linux-x86_64.tar.gz --directory assets/bin/linux64/
@@ -145,11 +145,12 @@ build:windows:
     - cd ../../..
     - mkdir -p assets/bin/win64/komodod
     - mkdir -p assets/bin/win64/pirated
-    - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/komodo_windows_${KOMODO_VERSION}.zip
-    - unzip komodo_windows_${KOMODO_VERSION}.zip
+    - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/komodo_${KOMODO_VERSION}_windows.zip
+    - unzip komodo_${KOMODO_VERSION}_windows.zip
+    - unzip win64.zip
     - mv win64/komodod.exe win64/komodo-cli.exe assets/bin/win64/komodod
-    - rm -rf win64
-    - rm komodo_windows_${KOMODO_VERSION}.zip
+    - rm -rf win64 win64.zip
+    - rm komodo_${KOMODO_VERSION}_windows.zip
     - gsutil cp $STAGING/$VERUS_CLI_WINDOWS .
     - unzip -qq Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip -d assets/bin/win64
     - mv assets/bin/win64/verus-cli assets/bin/win64/verusd
@@ -198,13 +199,13 @@ build:mac:
     - yarn run build
     - cd ../../..
     - gsutil cp $STAGING/$VERUS_CLI_MACOS .
-    - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/komodo_macos_${KOMODO_VERSION}.tar.gz
+    - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/komodo_${KOMODO_VERSION}_macos.zip
     - mkdir -p assets/bin/osx/verusd
     - mkdir -p assets/bin/osx/komodod
     - mkdir -p assets/bin/osx/pirated
     - tar -xzf Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz --strip=1 --directory assets/bin/osx/verusd
-    - tar -xzvf komodo_macos_${KOMODO_VERSION}.tar.gz  --strip=1 --directory assets/bin/osx/komodod
-    - rm komodo_macos_${KOMODO_VERSION}.tar.gz
+    - unzip -p komodo_${KOMODO_VERSION}_macos.zip | tar -xzvf - --strip=1 --directory assets/bin/osx/komodod
+    - rm komodo_${KOMODO_VERSION}_macos.zip
     - rm Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz
     - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-macos.tar.gz .
     - tar -xzvf zcashd-macos.tar.gz --directory assets/bin/osx/