Merge pull request #1765 from KomodoPlatform/vote2022-patch

ca333 · web-flow · commit c95869e3f69c · 2022-05-11T18:20:13.000+02:00
update version number and CI
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -57,16 +57,17 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           submodules: 'true'
 
-
-      - uses: actions/setup-python@v2
+      - name: Setup Python
+        uses: actions/setup-python@v3
         with:
-          python-version: '3.8'
+          python-version: '3.9'
 
       - name: Install QT (Linux)
         if: runner.os == 'Linux'
         uses: KomodoPlatform/install-qt-action@v2.14.0
         with:
           version: ${{ matrix.qt }}
+          setup-python: 'false'
           host: 'linux'
           target: 'desktop'
           dir: '${{ github.workspace }}'
@@ -79,6 +80,7 @@ jobs:
         uses: KomodoPlatform/install-qt-action@v2.14.0
         with:
           version: ${{ matrix.qt }}
+          setup-python: 'false'
           host: 'mac'
           target: 'desktop'
           dir: '${{ github.workspace }}'
@@ -358,5 +360,4 @@ jobs:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}_installer.exe
           retention-days: 7
-      
-      
+
diff --git a/.github/workflows/atomicdex-desktop-release-vt.yml b/.github/workflows/atomicdex-desktop-release-vt.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       -
         name: VirusTotal Scan
-        uses: crazy-max/ghaction-virustotal@v2.2.1
+        uses: crazy-max/ghaction-virustotal@v2.4.1
         with:
           vt_api_key: ${{ secrets.VT_API_KEY }}
           github_token: ${{ github.token }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.5)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.5.1)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)
diff --git a/assets/config/0.5.5.1-coins.json b/assets/config/0.5.5.1-coins.json
diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh
@@ -5,9 +5,12 @@ brew update
 brew tap-new $USER/local-nim
 brew extract --version=1.4.8 nim $USER/local-nim
 
+brew unlink libtool
+wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0fbd6e24c4122e18ade1ec6c5916cb21de14f352/Formula/libtool.rb
+brew install libtool.rb
+
 brew install autoconf \
             automake \
-            libtool \
             pkgconfig \
             wget \
             nim@1.4.8 \
diff --git a/ci_tools_atomic_dex/installer/osx/config/config.xml.in b/ci_tools_atomic_dex/installer/osx/config/config.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>${DEX_DISPLAY_NAME}</Name>
-    <Version>0.5.5</Version>
+    <Version>0.5.5.1</Version>
     <Title>${DEX_DISPLAY_NAME} Installer</Title>
     <ProductUrl>${DEX_WEBSITE}</ProductUrl>
     <Publisher>${DEX_COMPANY}</Publisher>
diff --git a/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.5</Version>
-    <ReleaseDate>2021-12-06</ReleaseDate>
+    <Version>0.5.5.1</Version>
+    <ReleaseDate>2022-05-11</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />
     </Licenses>
diff --git a/ci_tools_atomic_dex/installer/windows/config/config.xml.in b/ci_tools_atomic_dex/installer/windows/config/config.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>@DEX_DISPLAY_NAME@</Name>
-    <Version>0.5.5</Version>
+    <Version>0.5.5.1</Version>
     <Title>@DEX_DISPLAY_NAME@ Installer</Title>
     <ProductUrl>@DEX_WEBSITE@</ProductUrl>
     <Publisher>@DEX_COMPANY@</Publisher>
diff --git a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.5</Version>
-    <ReleaseDate>2021-12-06</ReleaseDate>
+    <Version>0.5.5.1</Version>
+    <ReleaseDate>2022-05-11</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />
     </Licenses>
diff --git a/ci_tools_atomic_dex/vcpkg-custom-ports b/ci_tools_atomic_dex/vcpkg-custom-ports
@@ -1 +1 @@
-Subproject commit 19453b682d43a354235b20809f59761d899a50ee
+Subproject commit 15ad59b2928caaaac104702ee5b46d0ae5c3da71
diff --git a/ci_tools_atomic_dex/vcpkg-repo b/ci_tools_atomic_dex/vcpkg-repo
@@ -1 +1 @@
-Subproject commit 63e935d967a3410e26bf4a708efa39d8384d2bbb
+Subproject commit 086ef2a4845fd12e5164df1876737afa67942208
diff --git a/cmake/install/macos/dex_install.cmake b/cmake/install/macos/dex_install.cmake
@@ -4,8 +4,8 @@ if (APPLE)
             MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
             RESOURCE ${ICON}
             MACOSX_BUNDLE_ICON_FILE dex-logo
-            MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.5
-            MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.5
+            MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.5.1
+            MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.5.1
             MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in")
     add_custom_command(TARGET ${PROJECT_NAME}
             POST_BUILD COMMAND
diff --git a/src/core/atomicdex/version/version.hpp b/src/core/atomicdex/version/version.hpp
@@ -21,7 +21,7 @@ namespace atomic_dex
     constexpr const char*
     get_version()
     {
-        return "0.5.5-beta";
+        return "0.5.5.1-beta";
     }
 
     constexpr int
@@ -33,12 +33,12 @@ namespace atomic_dex
     constexpr const char*
     get_raw_version()
     {
-        return "0.5.5";
+        return "0.5.5.1";
     }
 
     constexpr const char*
     get_precedent_raw_version()
     {
-        return "0.5.4";
+        return "0.5.5";
     }
 } // namespace atomic_dex
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "atomicdex-desktop",
-  "version-string": "0.5.5",
+  "version-string": "0.5.5.1",
   "dependencies": [
     "entt",
     "boost-multiprecision",

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ jobs:`
`10`	`10`	`steps:`
`11`	`11`	`-`
`12`	`12`	`name: VirusTotal Scan`
`13`		`- uses: crazy-max/ghaction-virustotal@v2.2.1`
	`13`	`+ uses: crazy-max/ghaction-virustotal@v2.4.1`
`14`	`14`	`with:`
`15`	`15`	`vt_api_key: ${{ secrets.VT_API_KEY }}`
`16`	`16`	`github_token: ${{ github.token }}`