Fixing unnecessary full builds on PR to develop (#1309)

enso-org · Mar 8, 2021 · 6a3845e · 6a3845e
1 parent fef2e4f
commit 6a3845e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/gui-ci.yml b/.github/workflows/gui-ci.yml
@@ -245,10 +245,10 @@ jobs:
         run: node ./run dist --skip-version-validation --target macos
         if: startsWith(matrix.os,'macos')
     if: >-
-      !(contains(github.event.head_commit.message,'[ci build]') ||
-      github.base_ref == 'develop' || github.base_ref == 'unstable' ||
-      github.base_ref == 'stable' || github.ref == 'refs/heads/unstable' ||
-      github.ref == 'refs/heads/stable')
+      !(contains(github.event.head_commit.message,'[ci build]') || github.ref ==
+      'develop' || github.base_ref == 'unstable' || github.base_ref == 'stable'
+      || github.ref == 'refs/heads/unstable' || github.ref ==
+      'refs/heads/stable')
   build:
     name: Build
     runs-on: ${{ matrix.os }}
@@ -374,9 +374,9 @@ jobs:
             dist/client/enso-linux-${{fromJson(steps.changelog.outputs.content).version}}.AppImage.sha256
         if: startsWith(matrix.os,'ubuntu')
     if: >-
-      contains(github.event.head_commit.message,'[ci build]') || github.base_ref
-      == 'develop' || github.base_ref == 'unstable' || github.base_ref ==
-      'stable' || github.ref == 'refs/heads/unstable' || github.ref ==
+      contains(github.event.head_commit.message,'[ci build]') || github.ref ==
+      'develop' || github.base_ref == 'unstable' || github.base_ref == 'stable'
+      || github.ref == 'refs/heads/unstable' || github.ref ==
       'refs/heads/stable'
   release_to_github:
     name: GitHub Release

diff --git a/build/workflow.js b/build/workflow.js
@@ -400,8 +400,10 @@ let releaseCondition = `github.ref == 'refs/heads/unstable' || github.ref == 're
 
 /// Make a full build if one of the following conditions is true:
 /// 1. There was a `FLAG_FORCE_CI_BUILD` flag set in the commit message (see its docs for more info).
-/// 2. It was a pull request to 'develop', 'unstable', or 'stable'.
-let buildCondition = `contains(github.event.head_commit.message,'${FLAG_FORCE_CI_BUILD}') || github.base_ref == 'develop' || github.base_ref == 'unstable' || github.base_ref == 'stable' || ${releaseCondition}`
+/// 2. It was a pull request to the 'unstable', or the 'stable' branch.
+/// 3. It was a commit to the 'develop' branch.
+/// Otherwise, perform a simplified (faster) build only.
+let buildCondition = `contains(github.event.head_commit.message,'${FLAG_FORCE_CI_BUILD}') || github.ref == 'develop' || github.base_ref == 'unstable' || github.base_ref == 'stable' || ${releaseCondition}`
 
 let workflow = {
     name : "GUI CI",