Skip to content

Commit

Permalink
feat: merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
neuqzxy committed Dec 6, 2024
2 parents cffc627 + afc3fc1 commit 4430401
Show file tree
Hide file tree
Showing 90 changed files with 2,996 additions and 496 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/hotfix-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build:
runs-on: macOS-12 # 如果用了electron,记得改成 macOS-latest
runs-on: macOS-13 # 如果用了electron,记得改成 macOS-latest
permissions:
contents: write
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
build:
runs-on: macOS-12 # 如果用了electron,记得改成 macOS-latest
runs-on: macOS-13 # 如果用了electron,记得改成 macOS-latest

permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
update-changelog-after-publish-a-release:
name: GitHub Actions Test
runs-on: macOS-12
runs-on: macOS-13

strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build:
runs-on: macOS-12 # 如果用了electron,记得改成 macOS-latest
runs-on: macOS-13 # 如果用了electron,记得改成 macOS-latest
permissions:
contents: write
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-main-to-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if_merged:
if: github.event.pull_request.merged == true

runs-on: macOS-12
runs-on: macOS-13

permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
build:
runs-on:
- macOS-12
- macOS-13

strategy:
matrix:
Expand Down
Loading

0 comments on commit 4430401

Please sign in to comment.