diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e92f2121..ca3d2866 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: Push CI on: push: - branches: [master, main] + branches: [main] jobs: repo-guards: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ef9c1254..ce124ba6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy to VPS on: workflow_run: workflows: ["Push CI"] - branches: [main, master] + branches: [main] types: - completed @@ -59,9 +59,9 @@ jobs: git checkout "$TARGET_BRANCH" git pull --ff-only origin "$TARGET_BRANCH" else - echo "Branch $TARGET_BRANCH not found, trying main or master" - git checkout main 2>/dev/null || git checkout master - git pull --ff-only origin main 2>/dev/null || git pull --ff-only origin master + echo "Branch $TARGET_BRANCH not found, trying main" + git checkout main + git pull --ff-only origin main fi if command -v docker &>/dev/null && docker compose version &>/dev/null; then diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index d8a52fe4..83d7ec31 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -2,7 +2,7 @@ name: PR Check on: pull_request: - branches: [main, master] + branches: [main] permissions: contents: read