setup

apache · Aug 22, 2024 · a767d73 · a767d73
1 parent 0a0f2c3
commit a767d73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -28,8 +28,7 @@ github:
   del_branch_on_merge: true
   #labels:
   enabled_merge_buttons:
-     # TODO: disable it after common merged
-    merge:  true
+    merge:  false
     rebase: true
     squash: true
   protected_branches:

diff --git a/.github/workflows/server-ci.yml b/.github/workflows/server-ci.yml
@@ -9,8 +9,7 @@ on:
   pull_request:
 
 jobs:
-  # TODO: rename to build-server later
-  build:
+  build-server:
     # TODO: we need test & replace it to ubuntu-24.04 or ubuntu-latest
     runs-on: ubuntu-20.04
     env: