Skip to content

Commit ba6a81f

Browse files
AcktariusAcktarius
authored
Merge pull request #211 from ConcealNetwork/development
Development
2 parents dc5da1b + 642e035 commit ba6a81f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+10230
-3913
lines changed

‎.github/workflows/appimage.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ on:
88
jobs:
99
build-appimage:
1010
name: AppImage
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@master
1414

1515
- name: Install dependencies
1616
run: |
17-
sudo apt update -y
18-
sudo apt install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev openssl
17+
sudo apt-get update -y
18+
sudo apt-get install -y qtbase5-dev qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev openssl
1919
2020
- name: Clone conceal-core
2121
run: |
@@ -50,7 +50,7 @@ jobs:
5050
echo "sha256=${sha256}" >> $GITHUB_OUTPUT
5151
5252
- name: Create Release
53-
uses: softprops/action-gh-release@v0.1.15
53+
uses: softprops/action-gh-release@v2.0.4
5454
with:
5555
files: ${{ steps.build.outputs.release_name }}
5656
name: Conceal Desktop v${{ steps.build.outputs.ccx_version }}

‎.github/workflows/check.yml‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
- uses: actions/checkout@master
1919

2020
- name: Setup msbuild
21-
uses: microsoft/setup-msbuild@v1.1.3
21+
uses: microsoft/setup-msbuild@v2
2222

2323
- name: Restore Boost
24-
uses: actions/cache@v3
24+
uses: actions/cache@v4
2525
id: restore-boost
2626
with:
2727
path: ${{env.BOOST_ROOT}}
@@ -31,7 +31,7 @@ jobs:
3131
if: steps.restore-boost.outputs.cache-hit != 'true'
3232
shell: powershell
3333
run: |
34-
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe"
34+
$Url = "https://archives.boost.io/release/1.83.0/binaries/boost_1_83_0-msvc-14.3-64.exe"
3535
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
3636
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}"
3737
@@ -82,6 +82,7 @@ jobs:
8282
lrelease src/languages/cn.ts
8383
lrelease src/languages/ru.ts
8484
lrelease src/languages/tr.ts
85+
lrelease src/languages/fr.ts
8586
New-Item "$build_folder\$release_folder" -ItemType Directory
8687
cd "$build_folder"
8788
@@ -115,7 +116,7 @@ jobs:
115116
mv installer/windows/bin/Conceal*.exe $release_name/
116117
117118
- name: Upload To GH Artifacts
118-
uses: actions/upload-artifact@v3
119+
uses: actions/upload-artifact@v4
119120
with:
120121
name: ${{ steps.build.outputs.release_name }}
121122
path: ${{ steps.build.outputs.release_name }}
@@ -124,14 +125,14 @@ jobs:
124125

125126
build-appimage:
126127
name: AppImage
127-
runs-on: ubuntu-20.04
128+
runs-on: ubuntu-22.04
128129
steps:
129130
- uses: actions/checkout@master
130131

131132
- name: Install dependencies
132133
run: |
133134
sudo apt-get update -y
134-
sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev openssl
135+
sudo apt-get install -y qtbase5-dev qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev openssl
135136
136137
- name: Clone conceal-core
137138
run: |
@@ -165,23 +166,23 @@ jobs:
165166
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
166167
167168
- name: Upload To GH Artifacts
168-
uses: actions/upload-artifact@v3
169+
uses: actions/upload-artifact@v4
169170
with:
170171
name: ${{ steps.appimage.outputs.release_name }}
171172
path: ${{ steps.appimage.outputs.release_name }}
172173
env:
173174
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
174175

175-
build-ubuntu20:
176-
name: Ubuntu 20.04
177-
runs-on: ubuntu-20.04
176+
build-ubuntu22:
177+
name: Ubuntu 22.04
178+
runs-on: ubuntu-22.04
178179
steps:
179180
- uses: actions/checkout@master
180181

181182
- name: Install dependencies
182183
run: |
183184
sudo apt-get update -y
184-
sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
185+
sudo apt-get install -y qtbase5-dev qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
185186
186187
- name: Clone conceal-core
187188
run: |
@@ -193,7 +194,7 @@ jobs:
193194
id: build
194195
run: |
195196
ccx_version=${GITHUB_SHA::7}
196-
release_name=ccx-desktop-ubuntu-2004-dev-"$ccx_version"
197+
release_name=ccx-desktop-ubuntu-2204-dev-"$ccx_version"
197198
198199
lrelease src/languages/*.ts
199200
make -j2 build-release
@@ -202,20 +203,22 @@ jobs:
202203
mv build/release/conceal-desktop $release_name
203204
cp conceal-desktop.desktop $release_name
204205
cp src/images/conceal.png $release_name/icon
206+
cp ubuntu-shortcut-creator.sh $release_name
207+
chmod 755 $release_name/ubuntu-shortcut-creator.sh
205208
206209
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
207210
208211
- name: Upload To GH Artifacts
209-
uses: actions/upload-artifact@v3
212+
uses: actions/upload-artifact@v4
210213
with:
211214
name: ${{ steps.build.outputs.release_name }}
212215
path: ${{ steps.build.outputs.release_name }}
213216
env:
214217
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
215218

216-
build-ubuntu22:
217-
name: Ubuntu 22.04
218-
runs-on: ubuntu-22.04
219+
build-ubuntu24:
220+
name: Ubuntu 24.04
221+
runs-on: ubuntu-24.04
219222
steps:
220223
- uses: actions/checkout@master
221224

@@ -234,7 +237,7 @@ jobs:
234237
id: build
235238
run: |
236239
ccx_version=${GITHUB_SHA::7}
237-
release_name=ccx-desktop-ubuntu-2204-dev-"$ccx_version"
240+
release_name=ccx-desktop-ubuntu-2404-dev-"$ccx_version"
238241
239242
lrelease src/languages/*.ts
240243
make -j2 build-release
@@ -243,11 +246,13 @@ jobs:
243246
mv build/release/conceal-desktop $release_name
244247
cp conceal-desktop.desktop $release_name
245248
cp src/images/conceal.png $release_name/icon
249+
cp ubuntu-shortcut-creator.sh $release_name
250+
chmod 755 $release_name/ubuntu-shortcut-creator.sh
246251
247252
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
248253
249254
- name: Upload To GH Artifacts
250-
uses: actions/upload-artifact@v3
255+
uses: actions/upload-artifact@v4
251256
with:
252257
name: ${{ steps.build.outputs.release_name }}
253258
path: ${{ steps.build.outputs.release_name }}
@@ -256,13 +261,13 @@ jobs:
256261

257262
build-macos:
258263
name: macOS
259-
runs-on: macos-12
264+
runs-on: macos-13
260265
steps:
261266
- uses: actions/checkout@master
262267

263268
- name: Install dependencies
264269
run: |
265-
brew install boost qt@5
270+
brew install boost@1.85 qt@5
266271
267272
- name: Clone conceal-core
268273
run: |
@@ -280,8 +285,10 @@ jobs:
280285
app_name="conceal-desktop.app"
281286
282287
lrelease src/languages/*.ts
283-
make -j3 build-release
288+
mkdir -p "$build_folder"
284289
cd "$build_folder"
290+
cmake ../.. -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=/usr/local/opt/boost@1.85
291+
make -j3
285292
macdeployqt "$app_name"
286293
cpack
287294
mkdir "$release_name"
@@ -292,7 +299,7 @@ jobs:
292299
echo "artifact_path=${build_folder}/${release_name}" >> $GITHUB_OUTPUT
293300
294301
- name: Upload To GH Artifacts
295-
uses: actions/upload-artifact@v3
302+
uses: actions/upload-artifact@v4
296303
with:
297304
name: ${{ steps.build.outputs.release_name }}
298305
path: ${{ steps.build.outputs.artifact_path }}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
jobs:
1818
analyze:
1919
name: Analyze
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121

2222
strategy:
2323
fail-fast: false
@@ -57,7 +57,7 @@ jobs:
5757
- name: Install dependencies
5858
run: |
5959
sudo apt update -y
60-
sudo apt install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
60+
sudo apt-get install -y qtbase5-dev qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
6161
6262
- name: Clone conceal-core
6363
run: |

‎.github/workflows/macOS.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
jobs:
99
build-macos:
1010
name: macOS
11-
runs-on: macos-12
11+
runs-on: macos-13
1212
steps:
1313
- uses: actions/checkout@master
1414

1515
- name: Install dependencies
1616
run: |
17-
brew install boost qt@5
17+
brew install boost@1.85 qt@5
1818
1919
- name: Clone conceal-core
2020
run: |
@@ -31,8 +31,10 @@ jobs:
3131
app_name="conceal-desktop.app"
3232
3333
lrelease src/languages/*.ts
34-
make -j4 build-release
34+
mkdir -p "$build_folder"
3535
cd "$build_folder"
36+
cmake ../.. -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=/usr/local/opt/boost@1.85
37+
make -j3
3638
macdeployqt "$app_name"
3739
cpack
3840
mkdir "$release_name"
@@ -46,7 +48,7 @@ jobs:
4648
echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
4749
4850
- name: Create Release
49-
uses: softprops/action-gh-release@v0.1.15
51+
uses: softprops/action-gh-release@v2.0.4
5052
with:
5153
files: ${{ steps.build.outputs.asset_path }}
5254
name: Conceal Desktop v${{ steps.build.outputs.ccx_version }}

‎.github/workflows/ubuntu22.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ jobs:
3636
mv $build_folder/conceal-desktop $release_name
3737
cp conceal-desktop.desktop $release_name
3838
cp src/images/conceal.png $release_name/icon
39+
cp ubuntu-shortcut-creator.sh $release_name
40+
chmod 755 $release_name/ubuntu-shortcut-creator.sh
3941
tar -czf "$release_name".tar.gz "$release_name"
4042
sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
4143
@@ -44,7 +46,7 @@ jobs:
4446
echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
4547
4648
- name: Create Release
47-
uses: softprops/action-gh-release@v0.1.15
49+
uses: softprops/action-gh-release@v2.0.4
4850
with:
4951
files: ${{ steps.build.outputs.release_name }}
5052
name: Conceal Desktop v${{ steps.build.outputs.ccx_version }}

.github/workflows/ubuntu20.yml renamed to .github/workflows/ubuntu24.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
name: Ubuntu 20.04
1+
name: Ubuntu 24.04
22

33
on:
44
push:
55
tags:
66
- "*"
77

88
jobs:
9-
build-ubuntu20:
10-
name: Ubuntu 20.04
11-
runs-on: ubuntu-20.04
9+
build-ubuntu24:
10+
name: Ubuntu 24.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- uses: actions/checkout@master
1414

1515
- name: Install dependencies
1616
run: |
1717
sudo apt update -y
18-
sudo apt install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
18+
sudo apt install -y qtbase5-dev qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
1919
2020
- name: Clone conceal-core
2121
run: |
@@ -26,7 +26,7 @@ jobs:
2626
id: build
2727
run: |
2828
ccx_version=$(echo "$GITHUB_REF" | sed 's|refs/tags/||')
29-
release_name=ccx-desktop-ubuntu-2004-v"$ccx_version"
29+
release_name=ccx-desktop-ubuntu-2404-v"$ccx_version"
3030
build_folder="build/release"
3131
3232
lrelease src/languages/*.ts
@@ -36,6 +36,8 @@ jobs:
3636
mv $build_folder/conceal-desktop $release_name
3737
cp conceal-desktop.desktop $release_name
3838
cp src/images/conceal.png $release_name/icon
39+
cp ubuntu-shortcut-creator.sh $release_name
40+
chmod 755 $release_name/ubuntu-shortcut-creator.sh
3941
tar -czf "$release_name".tar.gz "$release_name"
4042
sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
4143
@@ -44,12 +46,12 @@ jobs:
4446
echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
4547
4648
- name: Create Release
47-
uses: softprops/action-gh-release@v0.1.15
49+
uses: softprops/action-gh-release@v2.0.4
4850
with:
4951
files: ${{ steps.build.outputs.release_name }}
5052
name: Conceal Desktop v${{ steps.build.outputs.ccx_version }}
5153
body: |
52-
[Download for Ubuntu 20.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
54+
[Download for Ubuntu 24.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
5355
`SHA256 : ${{ steps.build.outputs.sha256 }}`
5456
append_body: true
5557
env:

‎.github/workflows/windows.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
- uses: actions/checkout@master
1616

1717
- name: Setup msbuild
18-
uses: microsoft/setup-msbuild@v1.1.3
18+
uses: microsoft/setup-msbuild@v2
1919

2020
- name: Restore Boost
21-
uses: actions/cache@v3
21+
uses: actions/cache@v4
2222
id: restore-boost
2323
with:
2424
path: ${{env.BOOST_ROOT}}
@@ -28,7 +28,7 @@ jobs:
2828
if: steps.restore-boost.outputs.cache-hit != 'true'
2929
shell: powershell
3030
run: |
31-
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe"
31+
$Url = "https://archives.boost.io/release/1.83.0/binaries/boost_1_83_0-msvc-14.3-64.exe"
3232
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
3333
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}"
3434
@@ -77,6 +77,7 @@ jobs:
7777
lrelease src/languages/cn.ts
7878
lrelease src/languages/ru.ts
7979
lrelease src/languages/tr.ts
80+
lrelease src/languages/fr.ts
8081
New-Item "$build_folder\$release_folder" -ItemType Directory
8182
cd "$build_folder"
8283
@@ -116,7 +117,7 @@ jobs:
116117
echo "asset_path=${asset_path}" >> $env:GITHUB_OUTPUT
117118
118119
- name: Create Release
119-
uses: softprops/action-gh-release@v0.1.15
120+
uses: softprops/action-gh-release@v2.0.4
120121
with:
121122
files: ${{ steps.pack.outputs.asset_path }}
122123
name: Conceal Desktop v${{ steps.build.outputs.ccx_version }}

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,5 @@ CMakeLists.txt
6868
*.pro.user
6969
*.pro.user*
7070
*.autosave
71-
cmake-build*
71+
qt_path.ini
72+
cmake-build*

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
"sparse_hash_set": "cpp",
7777
"sparsetable": "cpp",
7878
"locale": "cpp",
79-
"regex": "cpp"
79+
"regex": "cpp",
80+
"format": "cpp"
8081
}
8182
}

0 commit comments

Comments
 (0)