Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Tests
on:
push:
branches: ["master"]
branches: ["main"]
pull_request:
workflow_dispatch:

concurrency:
group: ci-${{ github.ref }}
Expand All @@ -11,7 +12,7 @@ concurrency:
jobs:
# Run "pre-commit run --all-files --hook-stage=manual"
pre-commit:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions meeseeksdev/meeseeksbox/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ def push_the_work(session, payload, arguments, local_config=None):
"GET", f"https://api.github.com/repos/{org_name}/{repo_name}"
).json()["default_branch"]
repo.git.checkout(default_branch)
repo.branches.workbranch.delete(repo, "workbranch", force=True) # type:ignore[attr-defined]
repo.branches.workbranch.delete(repo, "workbranch", force=True)
return succeeded


Expand Down Expand Up @@ -994,7 +994,7 @@ def keen_stats():
succeeded = False

repo.git.checkout(default_branch)
repo.branches.workbranch.delete(repo, "workbranch", force=True) # type:ignore[attr-defined]
repo.branches.workbranch.delete(repo, "workbranch", force=True)

# TODO checkout the default_branch and get rid of branch

Expand Down
Loading