Update CI to point to branch 'main' (#513)

* Update CI to point to branch 'main' * Add junk to test if build will fail * Revert "Add junk to test if build will fail" This reverts commit b054ffc. * Make build fail if webpack fails
Helioviewer-Project · Dec 14, 2023 · cfc26ac · cfc26ac
1 parent 9bf86ec
commit cfc26ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: Build and Test
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 permissions:
   contents: read

diff --git a/resources/build/build.xml b/resources/build/build.xml
@@ -36,7 +36,7 @@
         </exec>
 
         <echo>Running webpack</echo>
-        <exec dir="resources/build" executable="npx">
+        <exec failonerror="true" dir="resources/build" executable="npx">
             <arg line="webpack --mode=production" />
         </exec>