diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3cff918a..5163e457 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [main, dev*] + branches: [main] pull_request: # The branches below must be a subset of the branches above - branches: [dev*] + branches: [main] schedule: - cron: "26 13 * * 6" diff --git a/.github/workflows/lint-and-build.yml b/.github/workflows/lint-and-build.yml index 91d6cbd9..fffde568 100644 --- a/.github/workflows/lint-and-build.yml +++ b/.github/workflows/lint-and-build.yml @@ -11,7 +11,6 @@ on: push: branches: - main - - dev* paths: - "**.py" - "**.ui" @@ -20,7 +19,6 @@ on: pull_request: branches: - main - - dev* paths: - "**.py" - "**.pyi" diff --git a/.github/workflows/printenv.yml b/.github/workflows/printenv.yml index 1b032639..2c5dfdbd 100644 --- a/.github/workflows/printenv.yml +++ b/.github/workflows/printenv.yml @@ -11,7 +11,6 @@ on: push: branches: - main - - dev env: GITHUB_HEAD_REPOSITORY: ${{ github.event.pull_request.head.repo.full_name }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index db39db1e..993a43e5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,5 +26,5 @@ repos: - id: ruff-format ci: - autoupdate_branch: dev + autoupdate_branch: main autoupdate_schedule: quarterly diff --git a/README.md b/README.md index d5e85359..9bcc7bc3 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ To understand how to use AutoSplit and how it works in-depth, please read the [t - Download the [latest version](/../../releases/latest) - You can also check out the [latest dev builds](/../../actions/workflows/lint-and-build.yml?query=event%3Apush+is%3Asuccess) (requires a GitHub account) - (If you don't have a GitHub account, you can try [nightly.link](https://nightly.link/Toufool/AutoSplit/workflows/lint-and-build/dev)) + (If you don't have a GitHub account, you can try [nightly.link](https://nightly.link/Toufool/AutoSplit/workflows/lint-and-build/main)) - Linux users must ensure they are in the `tty` and `input` groups and have write access to `/dev/uinput`. You can run the following commands to do so: diff --git a/SECURITY.md b/SECURITY.md index ee4fd8d7..39c1afda 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -5,7 +5,6 @@ | Version | Supported | | ------- | :-------: | | main | :white_check_mark: | -| dev* | :white_check_mark: | | everything else | WIP branches, security support may be lacking | ## Reporting a Vulnerability diff --git a/scripts/compile_resources.ps1 b/scripts/compile_resources.ps1 index 57483dd0..a8b0ff14 100644 --- a/scripts/compile_resources.ps1 +++ b/scripts/compile_resources.ps1 @@ -18,8 +18,8 @@ foreach ($file in $files) { Write-Host 'Generated code from .ui files' $build_vars_path = "$PSScriptRoot/../src/gen/build_vars.py" -If ($Env:GITHUB_EXCLUDE_BUILD_NUMBER -eq $true -or ( - $Env:GITHUB_EVENT_NAME -eq 'push' -and $Env:GITHUB_REF_NAME -eq 'main') +If ($Env:GITHUB_EXCLUDE_BUILD_NUMBER -eq $true + # -or ($Env:GITHUB_EVENT_NAME -eq 'push' -and $Env:GITHUB_REF_NAME -eq 'main') ) { $BUILD_NUMBER = '' } diff --git a/src/utils.py b/src/utils.py index 3fd57e47..ee3409cb 100644 --- a/src/utils.py +++ b/src/utils.py @@ -314,5 +314,5 @@ def run_tesseract(png: bytes): # Shared strings # Check `excludeBuildNumber` during workflow dispatch build generate a clean version number -AUTOSPLIT_VERSION = "2.3" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "") +AUTOSPLIT_VERSION = "2.3.0" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "") GITHUB_REPOSITORY = AUTOSPLIT_GITHUB_REPOSITORY