Merge pull request #93 from saturneric/dev/2.0.10/main

Develop 2.1.0.2
saturneric · Mar 31, 2023 · 3cb8635 · 3cb8635
2 parents af1cd68 + 119091d
commit 3cb8635
Show file tree

Hide file tree

Showing 287 changed files with 1,543 additions and 620 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,8 +44,9 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
+          lfs: 'true'
           submodules: recursive
 
       # Initializes the CodeQL tools for scanning.
@@ -91,36 +92,23 @@ jobs:
           cd ${{github.workspace}}
 
       - name: Cache Qt
-        id: cache-qt
-        uses: actions/cache@v1
+        id: cache-qt-6
+        uses: actions/cache@v3
         with:
           path: ../Qt
-          key: ${{ runner.os }}-QtCache
+          key: ${{ runner.os }}-qt-cache-6
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
+          version: '6.4.2'
+          modules: 'qt5compat'
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
 
-      - name: Configure CMake
-        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-        run: cmake -G Ninja -B ${{github.workspace}}/build  -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON
-
-      - name: Build GpgFrontend
-        # Build your program with the given configuration
-        run: cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
+      - name: Configure CMake && Build GpgFrontend 
+        run: |
+          cmake -G Ninja -B ${{github.workspace}}/build  -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON
+          cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -34,8 +34,9 @@ jobs:
           git config --global core.eol lf
         if: matrix.os == 'windows-latest' ||  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
+          lfs: 'true'
           submodules: recursive
 
       - name: Install Dependence (Linux)
@@ -88,7 +89,7 @@ jobs:
 
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ../Qt
           key: ${{ runner.os }}-qt-cache-6
@@ -99,7 +100,7 @@ jobs:
         with:
           version: '6.4.2'
           modules: 'qt5compat'
-          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+          cache: ${{ steps.cache-qt.outputs.cache-hit }}
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Set up MinGW (Windows)
@@ -145,25 +146,25 @@ jobs:
 
       - name: Get Short SHA of Commit
         id: vars
-        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
       - name: Upload Artifact(Linux)
         uses: actions/upload-artifact@master
         with:
-          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
+          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
           path: ${{github.workspace}}/build/release/*
         if: matrix.os == 'ubuntu-latest'
 
       - name: Upload Artifact(macOS)
         uses: actions/upload-artifact@master
         with:
-          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
+          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
           path: ${{github.workspace}}/build/release/*
         if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Upload Artifact(Windows)
         uses: actions/upload-artifact@master
         with:
-          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
+          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
           path: ${{github.workspace}}/build/release/*
         if: matrix.os == 'windows-latest'
diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml
@@ -28,13 +28,15 @@ jobs:
     continue-on-error: true
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
+          lfs: 'true'
           submodules: 'recursive'
 
       - name: Get Short SHA of Commit
         id: vars
-        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+
 
       - name: Install Dependence (Ubuntu 20.04)
         run: |
@@ -91,5 +93,5 @@ jobs:
       - name: Upload Artifact(Linux DEB)
         uses: actions/upload-artifact@master
         with:
-          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}-deb-${{matrix.os}}
+          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}-deb-${{matrix.os}}
           path: ${{github.workspace}}/build-deb-${{matrix.os}}/gpgfrontend*.deb*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,13 +33,14 @@ jobs:
           git config --global core.eol lf
         if: matrix.os == 'windows-2019' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
+          lfs: 'true'
           submodules: recursive
 
       - name: Get Short SHA of Commit
         id: vars
-        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
       - name: Install Dependence (Linux)
         run: |
@@ -96,7 +97,7 @@ jobs:
 
       - name: Cache Qt (macOS)
         id: cache-qt-6
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ../Qt
           key: ${{ runner.os }}-qt-cache-6
@@ -107,7 +108,7 @@ jobs:
         with:
           version: '6.4.2'
           modules: 'qt5compat'
-          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+          cache: ${{ steps.cache-qt.outputs.cache-hit }}
         if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Install Dependence (macOS)
@@ -147,7 +148,7 @@ jobs:
 
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ../Qt
           key: ${{ runner.os }}-QtCache
@@ -156,7 +157,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+          cache: ${{ steps.cache-qt.outputs.cache-hit }}
         if: matrix.os == 'ubuntu-18.04'
 
       - name: Set up MinGW (Windows)
@@ -213,15 +214,15 @@ jobs:
           hdiutil convert ${{github.workspace}}/build/tmp.dmg -format UDZO -o ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg
           codesign -s "${{secrets.GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}}" ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg
           mv ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg \
-            ${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg
+            ${{github.workspace}}/build/artifactOut/GpgFrontend-${{env.sha_short}}-x86_64.dmg
           mv ${{github.workspace}}/build/GpgFrontend.app.zip \
-            ${{github.workspace}}/build/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.zip
+            ${{github.workspace}}/build/GpgFrontend-${{env.sha_short}}-x86_64.zip
         if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Notarize Release Build (macOS)
         run: |
           xcrun altool --notarize-app \
-          -f ${{github.workspace}}/build/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.zip \
+          -f ${{github.workspace}}/build/GpgFrontend-${{env.sha_short}}-x86_64.zip \
           --primary-bundle-id ${{secrets.GPGFRONTEND_XOCDE_APPID}} \
           -u ${{secrets.APPLE_DEVELOPER_ID}} \
           -p ${{secrets.APPLE_DEVELOPER_ID_SECRET}}
@@ -249,20 +250,20 @@ jobs:
       - name: Upload Artifact(Linux)
         uses: actions/upload-artifact@master
         with:
-          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
+          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
           path: ${{github.workspace}}/build/artifactOut/GpgFrontend*.AppImage*
         if: matrix.os == 'ubuntu-18.04'
 
       - name: Upload Artifact(macOS)
         uses: actions/upload-artifact@master
         with:
-          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
+          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
           path: ${{github.workspace}}/build/artifactOut/*
         if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Upload Artifact(Windows)
         uses: actions/upload-artifact@master
         with:
-          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
+          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{env.sha_short}}
           path: ${{github.workspace}}/build/release/*
         if: matrix.os == 'windows-2019'
diff --git a/README.md b/README.md
@@ -217,14 +217,8 @@ $ ./linuxdeployqt-continuous-x86_64.AppImage ../release/gpgfrontend/usr/share/ap
 
 ## Languages Support
 
-<<<<<<< HEAD
 The supported languages are listed here. Some languages use machine translation and have not been verified. If you want
 to join translation and verification work, please refer to [HERE](https://gpgfrontend.pub/#/translate-interface).
-=======
-The supported languages are listed here. Some translations use machine translation and have not been verified. If you want
-to join translation or verification work, please refer to [HERE](https://gpgfrontend.pub/#/translate-interface).
-
-> > > > > > > main
 
 ### Supported Languages