diff options
| author | Saturn&Eric <[email protected]> | 2023-07-13 16:47:19 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-07-13 16:47:19 +0000 |
| commit | 7c8c382ab183b9608eaf19d3848faa6d87c39fee (patch) | |
| tree | 8dc11045bee7caf8a1b936ee2203dd39bec59e07 | |
| parent | fix: imporve translation zh CN (diff) | |
| parent | Merge pull request #102 from CDmking/main (diff) | |
| download | GpgFrontend-7c8c382ab183b9608eaf19d3848faa6d87c39fee.tar.gz GpgFrontend-7c8c382ab183b9608eaf19d3848faa6d87c39fee.zip | |
Merge branch 'main' into dev/2.1.0/main
| -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 |
4 files changed, 14 insertions, 14 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 9a520c4d..fb3c0003 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: |