Skip to content

Commit 3cb8635

Browse files
saturnericsaturneric
authored
Merge pull request #93 from saturneric/dev/2.0.10/main
Develop 2.1.0.2
2 parents af1cd68 + 119091d commit 3cb8635

File tree

287 files changed

+1543
-620
lines changed

Some content is hidden

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

287 files changed

+1543
-620
lines changed

‎.github/workflows/codeql-analysis.yml

+13-25
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ jobs:
4444

4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@v2
47+
uses: actions/checkout@v3
4848
with:
49+
lfs: 'true'
4950
submodules: recursive
5051

5152
# Initializes the CodeQL tools for scanning.
@@ -91,36 +92,23 @@ jobs:
9192
cd ${{github.workspace}}
9293
9394
- name: Cache Qt
94-
id: cache-qt
95-
uses: actions/cache@v1
95+
id: cache-qt-6
96+
uses: actions/cache@v3
9697
with:
9798
path: ../Qt
98-
key: ${{ runner.os }}-QtCache
99+
key: ${{ runner.os }}-qt-cache-6
99100

100101
- name: Install Qt
101-
uses: jurplel/install-qt-action@v2
102+
uses: jurplel/install-qt-action@v3
102103
with:
104+
version: '6.4.2'
105+
modules: 'qt5compat'
103106
cached: ${{ steps.cache-qt.outputs.cache-hit }}
104107

105-
- name: Configure CMake
106-
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
107-
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
108-
run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON
109-
110-
- name: Build GpgFrontend
111-
# Build your program with the given configuration
112-
run: cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
113-
114-
# ℹ️ Command-line programs to run using the OS shell.
115-
# 📚 https://git.io/JvXDl
116-
117-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
118-
# and modify them (or add more) to build your code if your project
119-
# uses a compiled language
120-
121-
#- run: |
122-
# make bootstrap
123-
# make release
108+
- name: Configure CMake && Build GpgFrontend
109+
run: |
110+
cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON
111+
cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
124112
125113
- name: Perform CodeQL Analysis
126-
uses: github/codeql-action/analyze@v1
114+
uses: github/codeql-action/analyze@v2

‎.github/workflows/debug.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ jobs:
3434
git config --global core.eol lf
3535
if: matrix.os == 'windows-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
3636

37-
- uses: actions/checkout@v2
37+
- uses: actions/checkout@v3
3838
with:
39+
lfs: 'true'
3940
submodules: recursive
4041

4142
- name: Install Dependence (Linux)
@@ -88,7 +89,7 @@ jobs:
8889

8990
- name: Cache Qt
9091
id: cache-qt
91-
uses: actions/cache@v1
92+
uses: actions/cache@v3
9293
with:
9394
path: ../Qt
9495
key: ${{ runner.os }}-qt-cache-6
@@ -99,7 +100,7 @@ jobs:
99100
with:
100101
version: '6.4.2'
101102
modules: 'qt5compat'
102-
cached: ${{ steps.cache-qt.outputs.cache-hit }}
103+
cache: ${{ steps.cache-qt.outputs.cache-hit }}
103104
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
104105

105106
- name: Set up MinGW (Windows)
@@ -145,25 +146,25 @@ jobs:
145146

146147
- name: Get Short SHA of Commit
147148
id: vars
148-
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
149+
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
149150

150151
- name: Upload Artifact(Linux)
151152
uses: actions/upload-artifact@master
152153
with:
153-
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
154+
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
154155
path: ${{github.workspace}}/build/release/*
155156
if: matrix.os == 'ubuntu-latest'
156157

157158
- name: Upload Artifact(macOS)
158159
uses: actions/upload-artifact@master
159160
with:
160-
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
161+
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
161162
path: ${{github.workspace}}/build/release/*
162163
if: matrix.os == 'macos-11' || matrix.os == 'macos-12'
163164

164165
- name: Upload Artifact(Windows)
165166
uses: actions/upload-artifact@master
166167
with:
167-
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
168+
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
168169
path: ${{github.workspace}}/build/release/*
169170
if: matrix.os == 'windows-latest'

‎.github/workflows/release-deb-package.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ jobs:
2828
continue-on-error: true
2929
steps:
3030

31-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v3
3232
with:
33+
lfs: 'true'
3334
submodules: 'recursive'
3435

3536
- name: Get Short SHA of Commit
3637
id: vars
37-
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
38+
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
39+
3840

3941
- name: Install Dependence (Ubuntu 20.04)
4042
run: |
@@ -91,5 +93,5 @@ jobs:
9193
- name: Upload Artifact(Linux DEB)
9294
uses: actions/upload-artifact@master
9395
with:
94-
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}-deb-${{matrix.os}}
96+
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}-deb-${{matrix.os}}
9597
path: ${{github.workspace}}/build-deb-${{matrix.os}}/gpgfrontend*.deb*

‎.github/workflows/release.yml

+13-12
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ jobs:
3333
git config --global core.eol lf
3434
if: matrix.os == 'windows-2019' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
3535

36-
- uses: actions/checkout@v2
36+
- uses: actions/checkout@v3
3737
with:
38+
lfs: 'true'
3839
submodules: recursive
3940

4041
- name: Get Short SHA of Commit
4142
id: vars
42-
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
43+
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
4344

4445
- name: Install Dependence (Linux)
4546
run: |
@@ -96,7 +97,7 @@ jobs:
9697

9798
- name: Cache Qt (macOS)
9899
id: cache-qt-6
99-
uses: actions/cache@v1
100+
uses: actions/cache@v3
100101
with:
101102
path: ../Qt
102103
key: ${{ runner.os }}-qt-cache-6
@@ -107,7 +108,7 @@ jobs:
107108
with:
108109
version: '6.4.2'
109110
modules: 'qt5compat'
110-
cached: ${{ steps.cache-qt.outputs.cache-hit }}
111+
cache: ${{ steps.cache-qt.outputs.cache-hit }}
111112
if: matrix.os == 'macos-11' || matrix.os == 'macos-12'
112113

113114
- name: Install Dependence (macOS)
@@ -147,7 +148,7 @@ jobs:
147148

148149
- name: Cache Qt
149150
id: cache-qt
150-
uses: actions/cache@v1
151+
uses: actions/cache@v3
151152
with:
152153
path: ../Qt
153154
key: ${{ runner.os }}-QtCache
@@ -156,7 +157,7 @@ jobs:
156157
- name: Install Qt
157158
uses: jurplel/install-qt-action@v2
158159
with:
159-
cached: ${{ steps.cache-qt.outputs.cache-hit }}
160+
cache: ${{ steps.cache-qt.outputs.cache-hit }}
160161
if: matrix.os == 'ubuntu-18.04'
161162

162163
- name: Set up MinGW (Windows)
@@ -213,15 +214,15 @@ jobs:
213214
hdiutil convert ${{github.workspace}}/build/tmp.dmg -format UDZO -o ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg
214215
codesign -s "${{secrets.GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}}" ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg
215216
mv ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg \
216-
${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg
217+
${{github.workspace}}/build/artifactOut/GpgFrontend-${{env.sha_short}}-x86_64.dmg
217218
mv ${{github.workspace}}/build/GpgFrontend.app.zip \
218-
${{github.workspace}}/build/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.zip
219+
${{github.workspace}}/build/GpgFrontend-${{env.sha_short}}-x86_64.zip
219220
if: matrix.os == 'macos-11' || matrix.os == 'macos-12'
220221

221222
- name: Notarize Release Build (macOS)
222223
run: |
223224
xcrun altool --notarize-app \
224-
-f ${{github.workspace}}/build/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.zip \
225+
-f ${{github.workspace}}/build/GpgFrontend-${{env.sha_short}}-x86_64.zip \
225226
--primary-bundle-id ${{secrets.GPGFRONTEND_XOCDE_APPID}} \
226227
-u ${{secrets.APPLE_DEVELOPER_ID}} \
227228
-p ${{secrets.APPLE_DEVELOPER_ID_SECRET}}
@@ -249,20 +250,20 @@ jobs:
249250
- name: Upload Artifact(Linux)
250251
uses: actions/upload-artifact@master
251252
with:
252-
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
253+
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
253254
path: ${{github.workspace}}/build/artifactOut/GpgFrontend*.AppImage*
254255
if: matrix.os == 'ubuntu-18.04'
255256

256257
- name: Upload Artifact(macOS)
257258
uses: actions/upload-artifact@master
258259
with:
259-
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
260+
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
260261
path: ${{github.workspace}}/build/artifactOut/*
261262
if: matrix.os == 'macos-11' || matrix.os == 'macos-12'
262263

263264
- name: Upload Artifact(Windows)
264265
uses: actions/upload-artifact@master
265266
with:
266-
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
267+
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
267268
path: ${{github.workspace}}/build/release/*
268269
if: matrix.os == 'windows-2019'

‎README.md

-6
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,8 @@ $ ./linuxdeployqt-continuous-x86_64.AppImage ../release/gpgfrontend/usr/share/ap
217217

218218
## Languages Support
219219

220-
<<<<<<< HEAD
221220
The supported languages are listed here. Some languages use machine translation and have not been verified. If you want
222221
to join translation and verification work, please refer to [HERE](https://gpgfrontend.pub/#/translate-interface).
223-
=======
224-
The supported languages are listed here. Some translations use machine translation and have not been verified. If you want
225-
to join translation or verification work, please refer to [HERE](https://gpgfrontend.pub/#/translate-interface).
226-
227-
> > > > > > > main
228222

229223
### Supported Languages
230224

0 commit comments

Comments
 (0)