Skip to content

Commit 5cdb102

Browse files
committed
Remove the concept of a dev branch
1 parent ab18ae7 commit 5cdb102

File tree

8 files changed

+7
-11
lines changed

8 files changed

+7
-11
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [main, dev*]
16+
branches: [main]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [dev*]
19+
branches: [main]
2020
schedule:
2121
- cron: "26 13 * * 6"
2222

.github/workflows/lint-and-build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
push:
1212
branches:
1313
- main
14-
- dev*
1514
paths:
1615
- "**.py"
1716
- "**.ui"
@@ -20,7 +19,6 @@ on:
2019
pull_request:
2120
branches:
2221
- main
23-
- dev*
2422
paths:
2523
- "**.py"
2624
- "**.pyi"

.github/workflows/printenv.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
push:
1212
branches:
1313
- main
14-
- dev
1514

1615
env:
1716
GITHUB_HEAD_REPOSITORY: ${{ github.event.pull_request.head.repo.full_name }}

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ repos:
2626
- id: ruff-format
2727

2828
ci:
29-
autoupdate_branch: dev
29+
autoupdate_branch: main
3030
autoupdate_schedule: quarterly

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To understand how to use AutoSplit and how it works in-depth, please read the [t
2323

2424
- Download the [latest version](/../../releases/latest)
2525
- You can also check out the [latest dev builds](/../../actions/workflows/lint-and-build.yml?query=event%3Apush+is%3Asuccess) (requires a GitHub account)
26-
(If you don't have a GitHub account, you can try [nightly.link](https://nightly.link/Toufool/AutoSplit/workflows/lint-and-build/dev))
26+
(If you don't have a GitHub account, you can try [nightly.link](https://nightly.link/Toufool/AutoSplit/workflows/lint-and-build/main))
2727
- 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:
2828

2929
<!-- https://github.com/boppreh/keyboard/issues/312#issuecomment-1189734564 -->

SECURITY.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
| Version | Supported |
66
| ------- | :-------: |
77
| main | :white_check_mark: |
8-
| dev* | :white_check_mark: |
98
| everything else | WIP branches, security support may be lacking |
109

1110
## Reporting a Vulnerability

scripts/compile_resources.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ foreach ($file in $files) {
1818
Write-Host 'Generated code from .ui files'
1919

2020
$build_vars_path = "$PSScriptRoot/../src/gen/build_vars.py"
21-
If ($Env:GITHUB_EXCLUDE_BUILD_NUMBER -eq $true -or (
22-
$Env:GITHUB_EVENT_NAME -eq 'push' -and $Env:GITHUB_REF_NAME -eq 'main')
21+
If ($Env:GITHUB_EXCLUDE_BUILD_NUMBER -eq $true
22+
# -or ($Env:GITHUB_EVENT_NAME -eq 'push' -and $Env:GITHUB_REF_NAME -eq 'main')
2323
) {
2424
$BUILD_NUMBER = ''
2525
}

src/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,5 +314,5 @@ def run_tesseract(png: bytes):
314314

315315
# Shared strings
316316
# Check `excludeBuildNumber` during workflow dispatch build generate a clean version number
317-
AUTOSPLIT_VERSION = "2.3" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "")
317+
AUTOSPLIT_VERSION = "2.3.0" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "")
318318
GITHUB_REPOSITORY = AUTOSPLIT_GITHUB_REPOSITORY

0 commit comments

Comments
 (0)