From ab1d60894beec3267e38fbcc89ee467b723d592d Mon Sep 17 00:00:00 2001
From: Wojciech Danilo <wojciech.danilo@gmail.com>
Date: Thu, 4 Mar 2021 19:13:03 +0100
Subject: [PATCH] Improving workflow

Original commit: https://github.com/enso-org/ide/commit/248de84d99510518e8164d4927901e57fd004d49
---
 gui/.github/workflows/gui-ci.yml | 9 +++++++--
 gui/build/workflow.js            | 6 +++---
 gui/src/rust/Cargo.lock          | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gui/.github/workflows/gui-ci.yml b/gui/.github/workflows/gui-ci.yml
index 0650feed870..a161f85c22b 100644
--- a/gui/.github/workflows/gui-ci.yml
+++ b/gui/.github/workflows/gui-ci.yml
@@ -6,6 +6,7 @@
 name: GUI CI
 'on':
   - push
+  - pull_request
 jobs:
   version_assertions:
     name: Assertions
@@ -28,10 +29,14 @@ jobs:
         shell: bash
       - name: Assert Version Unstable
         run: node ./run assert-version-unstable --skip-version-validation
-        if: github.ref == 'refs/heads/unstable'
+        if: >-
+          github.ref == 'refs/heads/unstable' ||
+          github.event.pull_request.base.ref == 'refs/heads/unstable'
       - name: Assert Version Stable
         run: node ./run assert-version-stable --skip-version-validation
-        if: github.ref == 'refs/heads/stable'
+        if: >-
+          github.ref == 'refs/heads/stable' ||
+          github.event.pull_request.base.ref == 'refs/heads/stable'
       - id: checkCurrentReleaseTag
         uses: mukunku/tag-exists-action@v1.0.0
         env:
diff --git a/gui/build/workflow.js b/gui/build/workflow.js
index 756ca923b22..6554fc48fd4 100644
--- a/gui/build/workflow.js
+++ b/gui/build/workflow.js
@@ -317,13 +317,13 @@ function uploadToCDN(...names) {
 let assertVersionUnstable = {
     name: "Assert Version Unstable",
     run: "node ./run assert-version-unstable --skip-version-validation",
-    if: `github.ref == 'refs/heads/unstable'`
+    if: `github.ref == 'refs/heads/unstable' || github.event.pull_request.base.ref == 'refs/heads/unstable'`
 }
 
 let assertVersionStable = {
     name: "Assert Version Stable",
     run: "node ./run assert-version-stable --skip-version-validation",
-    if: `github.ref == 'refs/heads/stable'`
+    if: `github.ref == 'refs/heads/stable' || github.event.pull_request.base.ref == 'refs/heads/stable'`
 }
 
 let assertReleaseDoNotExists = [
@@ -361,7 +361,7 @@ let buildCondition   = `contains(github.event.head_commit.message,'${FLAG_FORCE_
 
 let workflow = {
     name : "GUI CI",
-    on: ['push'],
+    on: ['push','pull_request'],
     jobs: {
         version_assertions: job_on_macos("Assertions", [
             getCurrentReleaseChangelogInfo,
diff --git a/gui/src/rust/Cargo.lock b/gui/src/rust/Cargo.lock
index 099adf9c0bc..cd3891b1873 100644
--- a/gui/src/rust/Cargo.lock
+++ b/gui/src/rust/Cargo.lock
@@ -1281,7 +1281,7 @@ dependencies = [
  "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fuzzly 0.1.0",
  "ide-view 0.1.0",
- "itertools 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "json-rpc 0.1.0",
  "mockall 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",