Skip to content

Commit

Permalink
Remove the concept of a dev branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Avasam committed Feb 2, 2025
1 parent ab18ae7 commit 5cdb102
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/lint-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
push:
branches:
- main
- dev*
paths:
- "**.py"
- "**.ui"
Expand All @@ -20,7 +19,6 @@ on:
pull_request:
branches:
- main
- dev*
paths:
- "**.py"
- "**.pyi"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/printenv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
push:
branches:
- main
- dev

env:
GITHUB_HEAD_REPOSITORY: ${{ github.event.pull_request.head.repo.full_name }}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ repos:
- id: ruff-format

ci:
autoupdate_branch: dev
autoupdate_branch: main
autoupdate_schedule: quarterly
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

<!-- https://github.com/boppreh/keyboard/issues/312#issuecomment-1189734564 -->
Expand Down
1 change: 0 additions & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/compile_resources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
}
Expand Down
2 changes: 1 addition & 1 deletion src/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5cdb102

Please sign in to comment.