-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #197 from ConcealNetwork/development
Version 6.7.3
- Loading branch information
Showing
135 changed files
with
727 additions
and
1,183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,20 +11,27 @@ on: | |
jobs: | ||
build-windows: | ||
name: Windows | ||
runs-on: windows-2019 | ||
runs-on: windows-2022 | ||
env: | ||
BOOST_ROOT: C:/tools/boost/x86_64 | ||
BOOST_ROOT: C:/local/boost_1_83_0 | ||
steps: | ||
- uses: actions/checkout@master | ||
|
||
- name: Setup msbuild | ||
uses: microsoft/[email protected] | ||
|
||
- name: Restore Boost | ||
uses: actions/cache@v3 | ||
id: restore-boost | ||
with: | ||
path: ${{env.BOOST_ROOT}} | ||
key: boost_1_83_0-msvc-14.3-64 | ||
|
||
- name: Install Boost | ||
if: steps.restore-boost.outputs.cache-hit != 'true' | ||
shell: powershell | ||
run: | | ||
echo "${env:BOOST_ROOT}" | ||
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe" | ||
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe" | ||
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe") | ||
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}" | ||
|
@@ -78,7 +85,7 @@ jobs: | |
New-Item "$build_folder\$release_folder" -ItemType Directory | ||
cd "$build_folder" | ||
cmake -G "Visual Studio 16 2019" .. | ||
cmake -G "Visual Studio 17 2022" .. | ||
msbuild conceal-desktop.sln /p:Configuration=Release /m:2 | ||
echo "build_folder=${build_folder}" >> $env:GITHUB_OUTPUT | ||
|
@@ -95,9 +102,8 @@ jobs: | |
cd "$build_folder/$release_folder" | ||
mkdir "Final" | ||
choco install openssl -y | ||
cp "C:\Program Files\OpenSSL-Win64\libcrypto*.dll" "Final/" | ||
cp "C:\Program Files\OpenSSL-Win64\libssl*.dll" "Final/" | ||
cp "C:\Program Files\OpenSSL\libcrypto*.dll" "Final/" | ||
cp "C:\Program Files\OpenSSL\libssl*.dll" "Final/" | ||
windeployqt --release conceal-desktop.exe --dir "Final/" --no-translations --no-opengl-sw | ||
mv Final ../../installer/windows/build | ||
|
@@ -118,14 +124,14 @@ jobs: | |
|
||
build-appimage: | ||
name: AppImage | ||
runs-on: ubuntu-18.04 | ||
runs-on: ubuntu-20.04 | ||
steps: | ||
- uses: actions/checkout@master | ||
|
||
- name: Install dependencies | ||
run: | | ||
sudo apt-get update -y | ||
sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev | ||
sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev openssl | ||
- name: Clone conceal-core | ||
run: | | ||
|
@@ -166,47 +172,6 @@ jobs: | |
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
build-ubuntu18: | ||
name: Ubuntu 18.04 | ||
runs-on: ubuntu-18.04 | ||
steps: | ||
- uses: actions/checkout@master | ||
|
||
- name: Install dependencies | ||
run: | | ||
sudo apt-get update -y | ||
sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev | ||
- name: Clone conceal-core | ||
run: | | ||
rm -rf cryptonote | ||
git clone https://github.com/ConcealNetwork/conceal-core.git cryptonote | ||
./.github/checkout.sh | ||
- name: Build | ||
id: build | ||
run: | | ||
ccx_version=${GITHUB_SHA::7} | ||
release_name=ccx-desktop-ubuntu-1804-dev-"$ccx_version" | ||
lrelease src/languages/*.ts | ||
make -j2 build-release | ||
mkdir $release_name | ||
mkdir -p $release_name/icon | ||
mv build/release/conceal-desktop $release_name | ||
cp conceal-desktop.desktop $release_name | ||
cp src/images/conceal.png $release_name/icon | ||
echo "release_name=${release_name}" >> $GITHUB_OUTPUT | ||
- name: Upload To GH Artifacts | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: ${{ steps.build.outputs.release_name }} | ||
path: ${{ steps.build.outputs.release_name }} | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
build-ubuntu20: | ||
name: Ubuntu 20.04 | ||
runs-on: ubuntu-20.04 | ||
|
@@ -291,7 +256,7 @@ jobs: | |
|
||
build-macos: | ||
name: macOS | ||
runs-on: macos-11 | ||
runs-on: macos-12 | ||
steps: | ||
- uses: actions/checkout@master | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,20 +8,27 @@ on: | |
jobs: | ||
build-windows: | ||
name: Windows | ||
runs-on: windows-2019 | ||
runs-on: windows-2022 | ||
env: | ||
BOOST_ROOT: C:/tools/boost/x86_64 | ||
BOOST_ROOT: C:/local/boost_1_83_0 | ||
steps: | ||
- uses: actions/checkout@master | ||
|
||
- name: Setup msbuild | ||
uses: microsoft/[email protected] | ||
|
||
- name: Restore Boost | ||
uses: actions/cache@v3 | ||
id: restore-boost | ||
with: | ||
path: ${{env.BOOST_ROOT}} | ||
key: boost_1_83_0-msvc-14.3-64 | ||
|
||
- name: Install Boost | ||
if: steps.restore-boost.outputs.cache-hit != 'true' | ||
shell: powershell | ||
run: | | ||
echo "${env:BOOST_ROOT}" | ||
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe" | ||
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe" | ||
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe") | ||
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}" | ||
|
@@ -73,7 +80,7 @@ jobs: | |
New-Item "$build_folder\$release_folder" -ItemType Directory | ||
cd "$build_folder" | ||
cmake -G "Visual Studio 16 2019" .. | ||
cmake -G "Visual Studio 17 2022" .. | ||
msbuild conceal-desktop.sln /p:Configuration=Release /m:2 | ||
echo "build_folder=${build_folder}" >> $env:GITHUB_OUTPUT | ||
|
@@ -91,9 +98,8 @@ jobs: | |
cd "$build_folder/$release_folder" | ||
mkdir "Final" | ||
choco install openssl -y | ||
cp "C:\Program Files\OpenSSL-Win64\libcrypto*.dll" "Final/" | ||
cp "C:\Program Files\OpenSSL-Win64\libssl*.dll" "Final/" | ||
cp "C:\Program Files\OpenSSL\libcrypto*.dll" "Final/" | ||
cp "C:\Program Files\OpenSSL\libssl*.dll" "Final/" | ||
windeployqt --release conceal-desktop.exe --dir "Final/" --no-translations --no-opengl-sw | ||
mv Final ../../installer/windows/build | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
COPYRIGHT | ||
|
||
© 2018-2023 Conceal Network & Conceal Devs | ||
© 2017-2018 The Circle Foundation & Conceal Devs | ||
© 2011-2017 The Cryptonote developers | ||
|
||
LICENSE | ||
|
||
MIT | ||
|
||
Permission is hereby granted, free of charge, to any person | ||
obtaining a copy of this software and associated documentation | ||
files (the "Software"), to deal in the Software without | ||
restriction, including without limitation the rights to use, copy, | ||
modify, merge, publish, distribute, sublicense, and/or sell copies | ||
of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
. | ||
The above copyright notice and this permission notice shall be | ||
included in all copies or substantial portions of the Software. | ||
. | ||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
DEALINGS IN THE SOFTWARE. | ||
|
||
Distributed under the MIT/X11 software license http://www.opensource.org/licenses/mit-license.php |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.