From aaf52718c002b3cac343e2758532478460bb7499 Mon Sep 17 00:00:00 2001 From: Luis <101060519+luisfun@users.noreply.github.com> Date: Thu, 6 Feb 2025 16:23:43 +0900 Subject: [PATCH] chore: delete sync dev (#17) * chore: fix ci on: branches * chore: delete sync dev * chore: rename --- .github/workflows/ci.yml | 6 +++--- .github/workflows/sync-dev.yml | 27 --------------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 .github/workflows/sync-dev.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65f845e..a5ded45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,9 @@ -name: ci +name: CI on: push: - branches: [ '**', '!master' ] + branches: [ '**', '!main' ] pull_request: - branches: [ master ] + branches: [ main ] permissions: contents: read diff --git a/.github/workflows/sync-dev.yml b/.github/workflows/sync-dev.yml deleted file mode 100644 index 485e5f0..0000000 --- a/.github/workflows/sync-dev.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Sync dev with main - -on: - push: - branches: - - main - -permissions: read-all - -jobs: - sync-branches: - runs-on: ubuntu-latest - permissions: - contents: write - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Merge main -> dev - run: | - git config --global user.name 'GitHub Action' - git config --global user.email 'action@github.com' - git fetch origin dev:dev - git checkout dev - git merge origin/main - git push origin dev