diff --git a/.github/configs/auto-assign.yml b/.github/configs/auto-assign.yml deleted file mode 100644 index a4ccf688..00000000 --- a/.github/configs/auto-assign.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Set to true to add reviewers to PRs -addReviewers: true - -# Set to 'author' to add PR's author as a assignee -addAssignees: author - -# A list of reviewers to be added to PRs (GitHub user name) -reviewers: - - Lruihao - -# A number of reviewers added to the PR -# Set 0 to add all the reviewers (default: 0) -numberOfReviewers: 1 - -# A list of assignees, overrides reviewers if set -assignees: - - Lruihao - -# A number of assignees to add to the PRs -# Set to 0 to add all of the assignees. -# Uses numberOfReviewers if unset. -numberOfAssignees: 0 - -# A list of keywords to be skipped the process if PR's title include it -skipKeywords: - - wip - - deps-dev \ No newline at end of file diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml deleted file mode 100644 index 22d2e1b7..00000000 --- a/.github/workflows/auto-assign.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Auto Assign -on: - issues: - types: [opened] - pull_request_target: - types: [opened] -jobs: - run: - runs-on: ubuntu-latest - steps: - - uses: wow-actions/auto-assign@v3 - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CONFIG_FILE: .github/configs/auto-assign.yml \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be3b6935..3648003f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: Hugo build check on: pull_request: - branches: [ master ] + branches: [ main ] workflow_dispatch: jobs: Actions-Hugo-Check: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e59fa73d..fccae593 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,10 +14,10 @@ name: "CodeQL" on: push: branches: - - master + - main pull_request: branches: - - master + - main schedule: - cron: "30 18 * * 5" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81518a4e..bc53b4fe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ name: Release for new tag # Controls when the action will run. on: - # Triggers the workflow on push or pull request events but only for the master branch + # Triggers the workflow on push or pull request events but only for the main branch push: tags: - 'v*.*.*' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ce0e8cf9..9d945fd6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,19 +41,17 @@ Finally, create a new pull request at master:** `--rebase` | -| PR | **others:master => master:** `--rebase` | -| single feature| **feature branch => dev/master:** `--merge` | +| event | merge | +| :------------- | :------------------------------------ | +| PR | **others:main => main:** `--rebase` | +| single feature | **feature branch => main:** `--merge` | ### Commit message diff --git a/theme.toml b/theme.toml index a6f55430..cd66da3c 100644 --- a/theme.toml +++ b/theme.toml @@ -3,7 +3,7 @@ name = "FixIt" license = "MIT" -licenselink = "https://github.com/hugo-fixit/FixIt/blob/master/LICENSE" +licenselink = "https://github.com/hugo-fixit/FixIt/blob/main/LICENSE" description = "A Clean, Elegant but Advanced Hugo Theme for Hugo." homepage = "https://github.com/hugo-fixit/FixIt" demosite = "https://fixit.lruihao.cn"