Skip to content
This repository has been archived by the owner on Dec 28, 2021. It is now read-only.

Fixing unnecessary full builds on PR to develop #1309

Merged
merged 3 commits into from
Mar 8, 2021
Merged

Fixing unnecessary full builds on PR to develop #1309

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d5e850
Fixing the CI
wdanilo Mar 8, 2021
3f0273e
regenerating cfg
wdanilo Mar 8, 2021
037a681
Fixing doc comment
wdanilo Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/gui-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/workflow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ 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'.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment should be updated.

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}`
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",
Expand Down