Merge branch 'dev'

# Conflicts: # .github/workflows/AutoTag.yml # .github/workflows/macos-6.2.yml # .github/workflows/macos.yml # .github/workflows/ubuntu-6.2.yml # .github/workflows/ubuntu.yml # .github/workflows/windows-6.2.yml # .github/workflows/windows.yml # goldendict.pro
xiaoyifang · Apr 1, 2022 · f9978dd · f9978dd
2 parents 15926ef + 5d2426c
commit f9978dd
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 143 deletions.
diff --git a/.github/workflows/macos-6.2.yml b/.github/workflows/macos-6.2.yml
@@ -3,31 +3,31 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on: 
-  workflow_run:
-    workflows: [AutoTag]
-    types: [completed]
+  # workflow_run:
+  #   workflows: [AutoTag]
+  #   types: [completed]
   workflow_dispatch:
-  # push:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
-  #     - ".clang-format"
-  # pull_request:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
+  push:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
+      - ".clang-format"
+  pull_request:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
 jobs:
   build:
     name: Build

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -3,31 +3,31 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on: 
-  workflow_run:
-    workflows: [AutoTag]
-    types: [completed]
+  # workflow_run:
+  #   workflows: [AutoTag]
+  #   types: [completed]
   workflow_dispatch:
-  # push:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
-  #     - ".clang-format"
-  # pull_request:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
+  push:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
+      - ".clang-format"
+  pull_request:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
 jobs:
   build:
     name: Build

diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml
@@ -8,27 +8,27 @@ on:
   #   workflows: [AutoTag]
   #   types: [completed]
   workflow_dispatch:
-  # push:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
-  #     - ".clang-format"
-  # pull_request:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
+  push:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
+      - ".clang-format"
+  pull_request:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
 jobs:
   build:
     name: Build

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -4,31 +4,31 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on: 
-  workflow_run:
-    workflows: [AutoTag]
-    types: [completed]
+  # workflow_run:
+  #   workflows: [AutoTag]
+  #   types: [completed]
   workflow_dispatch:
-  # push:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
-  #     - ".clang-format"
-  # pull_request:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
+  push:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
+      - ".clang-format"
+  pull_request:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
 jobs:
   build:
     name: Build

diff --git a/.github/workflows/windows-6.2.yml b/.github/workflows/windows-6.2.yml
@@ -3,32 +3,31 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on: 
-  workflow_run:
-    workflows: [AutoTag]
-    types: [completed]
+  # workflow_run:
+  #   workflows: [AutoTag]
+  #   types: [completed]
   workflow_dispatch:
-  # push代码时触发workflow
-  # push:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
-  #     - ".clang-format"      
-  # pull_request:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
+  push:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
+      - ".clang-format"      
+  pull_request:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
 jobs:
   build:
     name: Build

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -3,32 +3,31 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on: 
-  workflow_run:
-    workflows: [AutoTag]
-    types: [completed]
+  # workflow_run:
+  #   workflows: [AutoTag]
+  #   types: [completed]
   workflow_dispatch:
-  # push代码时触发workflow
-  # push:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
-  #     - ".clang-format"      
-  # pull_request:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
+  push:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
+      - ".clang-format"      
+  pull_request:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
 jobs:
   build:
     name: Build