Merge pull request #273 from BY-juun/master

Feature: Modify server deployment github action to run only when production pr is closed
june-by · Nov 14, 2023 · 9d1ad76 · 9d1ad76 · vercel · Nov 14, 2023
2 parents 05c010a + d15f814
commit 9d1ad76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/server_deploy.yml b/.github/workflows/server_deploy.yml
@@ -2,7 +2,9 @@ name: dev branch auto ci process script
 
 on:
   pull_request:
-    branches: [production]
+    branches: production
+    types:
+      - closed
 
 jobs:
   deploy:

diff --git a/server/build/config/express.js b/server/build/config/express.js
@@ -54,7 +54,7 @@ function default_1() {
         app.use(passport_1.default.session());
         app.set("trust proxy", 1);
         app.use("/test", (req, res, next) => {
-            res.send("github action deploy test33");
+            res.send("github action deploy test44");
         });
         _routes_1.default.forEach(({ url, router }) => {
             app.use(url, router);

diff --git a/server/src/config/express.ts b/server/src/config/express.ts
@@ -48,7 +48,7 @@ export default async function () {
   app.set("trust proxy", 1);
 
   app.use("/test", (req, res, next) => {
-    res.send("github action deploy test33");
+    res.send("github action deploy test44");
   });
 
   ROUTER_LIST.forEach(({ url, router }) => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,9 @@ name: dev branch auto ci process script @@
     on:
       pull_request:
-        branches: [production]
+        branches: production
+        types:
+          - closed
     jobs:
       deploy:
@@ Expand Down @@