summary refs log tree commit diff
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2023-08-27 16:56:22 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2023-08-27 16:56:22 +1000
commitda58998bc903a28728c639a1267bed2571c71f23 (patch)
tree0c8227595cf0c4ced6518fd566408b76997b15f0
parentprevent put /guilds/id/members/id for others until we have oauth2 scopes impled (diff)
parentUpdate style.yml (diff)
downloadserver-da58998bc903a28728c639a1267bed2571c71f23.tar.xz
Merge branch 'master' of github.com:spacebarchat/server
-rw-r--r--.github/workflows/build.yml6
-rw-r--r--.github/workflows/style.yml6
2 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3bcc81f..d5ce87e2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: [ "**" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "**" ]
+    branches: [ "master" ]
 
 jobs:
   build:
@@ -25,4 +25,4 @@ jobs:
         cache: 'npm'
     - run: npm ci
     - run: npm run build --if-present
-    - run: npm run test --if-present
\ No newline at end of file
+    - run: npm run test --if-present
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index 4fd62bae..8b18f6e6 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -2,9 +2,9 @@ name: Style
 
 on:
   push:
-    branches: [ "**" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "**" ]
+    branches: [ "master" ]
 
 jobs:
   build:
@@ -25,4 +25,4 @@ jobs:
         cache: 'npm'
     - run: npm i --only=dev
     - run: npx eslint .
-    - run: npx prettier --check .
\ No newline at end of file
+    - run: npx prettier --check .