Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop 2.1.1.3 #99

Merged
merged 3 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-deb-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trigger-doxygen-genration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 0 additions & 10 deletions GnuPG.entitlements

This file was deleted.

13 changes: 13 additions & 0 deletions amplify.yml
Original file line number Diff line number Diff line change
@@ -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: []
1 change: 1 addition & 0 deletions manual/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
name: 'GpgFrontend',
loadNavbar: true,
loadSidebar: true,
routerMode: 'history',
coverpage: true,
onlyCover: true,
subMaxLevel: 3,
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down