fix commit message, redunant task names, and replace run_action with …

…node script
Jigsaw-Code · Feb 6, 2024 · af31468 · af31468
1 parent b510c6c
commit af31468
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 17 deletions.
diff --git a/.github/workflows/build_and_test_debug_client.yml b/.github/workflows/build_and_test_debug_client.yml
@@ -15,9 +15,8 @@ on:
 
 # TODO: run go tests
 jobs:
-
   web_test:
-    name: Client Web Test
+    name: Web Test
     runs-on: ubuntu-20.04
     timeout-minutes: 10
     steps:
@@ -48,7 +47,7 @@ jobs:
           flags: unittests, www
 
   linux_debug_build:
-    name: Linux Client Debug Build
+    name: Linux Debug Build
     runs-on: ubuntu-20.04
     timeout-minutes: 10
     needs: web_test
@@ -74,7 +73,7 @@ jobs:
         run: npm run action electron/build linux
 
   windows_debug_build:
-    name: Windows Client Debug Build
+    name: Windows Debug Build
     runs-on: windows-2019
     timeout-minutes: 10
     needs: web_test
@@ -103,7 +102,7 @@ jobs:
         run: npm run action electron/build windows
 
   macos_debug_build:
-    name: MacOS Client Debug Build
+    name: MacOS Debug Build
     runs-on: macos-13
     timeout-minutes: 20
     needs: web_test
@@ -144,7 +143,7 @@ jobs:
           flags: unittests, apple, macos
 
   ios_debug_build:
-    name: iOS Client Debug Build
+    name: iOS Debug Build
     runs-on: macos-13
     timeout-minutes: 20
     needs: web_test
@@ -185,7 +184,7 @@ jobs:
           flags: unittests, apple, ios
 
   maccatalyst_debug_build:
-    name: Mac Catalyst Client Debug Build
+    name: Mac Catalyst Debug Build
     runs-on: macos-13
     timeout-minutes: 20
     needs: web_test
@@ -226,7 +225,7 @@ jobs:
           flags: unittests, apple, maccatalyst
 
   android_debug_build:
-    name: Android Client Debug Build
+    name: Android Debug Build
     runs-on: ubuntu-20.04
     timeout-minutes: 10
     needs: web_test

diff --git a/.github/workflows/build_and_test_debug_manager.yml b/.github/workflows/build_and_test_debug_manager.yml
@@ -34,7 +34,7 @@ jobs:
         run: npm run lint
 
   web_test:
-    name: Manager Web Test
+    name: Web Test
     runs-on: ubuntu-latest
     needs: lint
     steps:
@@ -54,7 +54,7 @@ jobs:
         run: npm run action server_manager/test
 
   linux_debug_build:
-    name: Linux Manager Debug Build
+    name: Linux Debug Build
     runs-on: ubuntu-latest
     needs: web_test
     env:
@@ -76,7 +76,7 @@ jobs:
         run: npm run action server_manager/electron_app/build linux
 
   windows_debug_build:
-    name: Windows Manager Debug Build
+    name: Windows Debug Build
     runs-on: windows-2019
     needs: web_test
     env:
@@ -98,7 +98,7 @@ jobs:
         run: npm run action server_manager/electron_app/build windows
 
   mac_debug_build:
-    name: MacOS Manager Debug Build
+    name: MacOS Debug Build
     runs-on: macos-11
     needs: web_test
     env:

diff --git a/commitlint.config.js b/commitlint.config.js
@@ -26,5 +26,10 @@ module.exports = {
         'www',
       ],
     ],
+    'type-enum': [
+      2,
+      'always',
+      ['build', 'chore', 'ci', 'docs', 'feat', 'fix', 'perf', 'proposal', 'refactor', 'revert', 'style', 'test'],
+    ],
   },
 };
diff --git a/server_manager/electron_app/build.action.sh b/server_manager/electron_app/build.action.sh
@@ -50,7 +50,7 @@ if [[ -z "${WEBPACK_MODE:-}" ]]; then
 fi
 
 # Build the Web App.
-run_action server_manager/web_app/build
+node ../../src/build/run_action.mjs server_manager/web_app/build
 
 # Compile the Electron main process and preload to the app root folder.
 # Since Node.js on Cygwin doesn't like absolute Unix-style paths,

diff --git a/server_manager/electron_app/package.action.sh b/server_manager/electron_app/package.action.sh
@@ -97,7 +97,7 @@ function main() {
     *) ;;
     esac
   done
-  run_action server_manager/electron_app/build --buildMode="${BUILD_MODE}" --versionName="${version_name}"
+  node ../../src/build/run_action.mjs server_manager/electron_app/build --buildMode="${BUILD_MODE}" --versionName="${version_name}"
   package_electron
   finish_yaml_files "${staging_percentage}"
 }

diff --git a/server_manager/electron_app/start.action.sh b/server_manager/electron_app/start.action.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-run_action server_manager/electron_app/build "$@"
+node ../../src/build/run_action.mjs server_manager/electron_app/build "$@"
 
 cd "${BUILD_DIR}/server_manager/electron_app/static"
 

diff --git a/server_manager/web_app/build.action.sh b/server_manager/web_app/build.action.sh
@@ -19,7 +19,7 @@ set -eu
 readonly OUT_DIR="${BUILD_DIR}/server_manager/web_app"
 rm -rf "${OUT_DIR}"
 
-run_action server_manager/web_app/build_install_script
+node ../../src/build/run_action.mjs server_manager/web_app/build_install_script
 
 # Node.js on Cygwin doesn't like absolute Unix-style paths.
 # So, we use a relative path as input to webpack.

diff --git a/server_manager/web_app/start.action.sh b/server_manager/web_app/start.action.sh
@@ -18,6 +18,6 @@ set -eu
 
 rm -rf "${BUILD_DIR}/server_manager/web_app"
 
-run_action server_manager/web_app/build_install_script
+node ../../src/build/run_action.mjs server_manager/web_app/build_install_script
 
 webpack-dev-server --config=src/server_manager/browser.webpack.js --open