hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 23:34:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge branch 'dev'

Browse source 
# 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
This commit is contained in:
xiaoyifang 2022-04-01 21:01:52 +08:00
parent 15926efd95 5d2426c805
commit f9978dd1cc
6 changed files with 141 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
.github/workflows/macos-6.2.yml vendored
View file

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

48
.github/workflows/macos.yml vendored
View file

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

42
.github/workflows/ubuntu-6.2.yml vendored
View file

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

48
.github/workflows/ubuntu.yml vendored
View file

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

49
.github/workflows/windows-6.2.yml vendored
View file

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

49
.github/workflows/windows.yml vendored
View file

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