diff options
| author | Saturn&Eric <[email protected]> | 2023-04-24 05:15:02 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-24 05:15:02 +0000 |
| commit | 59f5c2ae2a086994b43a6a252da0986fad4cb884 (patch) | |
| tree | 0aa2f66a52a7700902c51b0a8f5fd5eb56970be8 | |
| parent | Merge pull request #96 from saturneric/dev/2.1.0/main (diff) | |
| parent | fix: update ci config (diff) | |
| download | GpgFrontend-59f5c2ae2a086994b43a6a252da0986fad4cb884.tar.gz GpgFrontend-59f5c2ae2a086994b43a6a252da0986fad4cb884.zip | |
Merge pull request #99 from saturneric/develop
Develop 2.1.1.3
| -rw-r--r-- | .github/workflows/debug.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/release-deb-package.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/trigger-doxygen-genration.yml | 4 | ||||
| -rw-r--r-- | GnuPG.entitlements | 10 | ||||
| -rw-r--r-- | amplify.yml | 13 | ||||
| -rw-r--r-- | manual/index.html | 1 | ||||
| -rw-r--r-- | resource/entitlements/GpgFrontend.entitlements (renamed from GpgFrontend.entitlements) | 0 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
9 files changed, 29 insertions, 25 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 2e2b5e7f..6985d60b 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -2,16 +2,16 @@ name: Debug Build & Package on: push: - branches: [ 'develop-**', 'dev/**' ] + branches: [ 'develop', 'dev/**' ] paths-ignore: - 'resource/locale/template/**' - - 'docs/**' + - 'manual/**' - '**.md' pull_request: - branches: [ 'develop-**', 'dev/**' ] + branches: [ 'develop', 'dev/**' ] paths-ignore: - 'resource/locale/template/**' - - 'docs/**' + - 'manual/**' - '**.md' env: diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml index a218e9d0..15b009b5 100644 --- a/.github/workflows/release-deb-package.yml +++ b/.github/workflows/release-deb-package.yml @@ -2,16 +2,16 @@ name: Build Linux Packages on: push: - branches: [ main, 'develop-**', 'dev/**' ] + branches: [ main, 'develop', 'dev/**' ] paths-ignore: - 'resource/locale/template/**' - - 'docs/**' + - 'manual/**' - '**.md' pull_request: - branches: [ 'develop-**', 'dev/**' ] + branches: [ 'develop', 'dev/**' ] paths-ignore: - 'resource/locale/template/**' - - 'docs/**' + - 'manual/**' - '**.md' env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea65b0ac..d24827c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,16 +2,16 @@ name: Build & Package on: push: - branches: [ main, 'develop-**', 'dev/**' ] + branches: [ main, 'develop', 'dev/**' ] paths-ignore: - 'resource/locale/template/**' - - 'docs/**' + - 'manual/**' - '**.md' pull_request: - branches: [ 'develop-**', 'dev/**' ] + branches: [ 'develop', 'dev/**' ] paths-ignore: - 'resource/locale/template/**' - - 'docs/**' + - 'manual/**' - '**.md' env: diff --git a/.github/workflows/trigger-doxygen-genration.yml b/.github/workflows/trigger-doxygen-genration.yml index b2451781..ed7ccb17 100644 --- a/.github/workflows/trigger-doxygen-genration.yml +++ b/.github/workflows/trigger-doxygen-genration.yml @@ -2,10 +2,10 @@ name: Doxygen Generation on: push: - branches: [ main, 'develop-**', 'dev/**' ] + branches: [ main, 'develop', 'dev/**' ] paths-ignore: - 'resource/locale/template/**' - - 'docs/**' + - 'manual/**' - '**.md' jobs: diff --git a/GnuPG.entitlements b/GnuPG.entitlements deleted file mode 100644 index 794eada1..00000000 --- a/GnuPG.entitlements +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>com.apple.security.app-sandbox</key> - <true/> - <key>com.apple.security.inherit</key> - <true/> -</dict> -</plist> diff --git a/amplify.yml b/amplify.yml new file mode 100644 index 00000000..60495a1c --- /dev/null +++ b/amplify.yml @@ -0,0 +1,13 @@ +version: 1 +frontend: + phases: + # IMPORTANT - Please verify your build commands + build: + commands: [] + artifacts: + # IMPORTANT - Please verify your build output directory + baseDirectory: /manual + files: + - '**/*' + cache: + paths: [] diff --git a/manual/index.html b/manual/index.html index b1e0766b..edb781e7 100644 --- a/manual/index.html +++ b/manual/index.html @@ -18,6 +18,7 @@ name: 'GpgFrontend', loadNavbar: true, loadSidebar: true, + routerMode: 'history', coverpage: true, onlyCover: true, subMaxLevel: 3, diff --git a/GpgFrontend.entitlements b/resource/entitlements/GpgFrontend.entitlements index 637aa6f1..637aa6f1 100644 --- a/GpgFrontend.entitlements +++ b/resource/entitlements/GpgFrontend.entitlements diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e16d40e4..2ecc8cb6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -428,7 +428,7 @@ if (APPLICATION_BUILD) WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMENT "Copying Buddled GnuPG into App Bundle Resource") set_target_properties(${AppName} PROPERTIES - XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_SOURCE_DIR}/GpgFrontend.entitlements" + XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_SOURCE_DIR}/resource/entitlements/GpgFrontend.entitlements" ) else() message(STATUS "Build Application Without App Sandbox") |