From 4fb8a9a73cb5c42543e02ce1d797a6d028f6068f Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro@pietroalbini.org>
Date: Wed, 23 Oct 2019 16:07:13 +0200
Subject: [PATCH] ci: extract job skipping logic into a script

---
 src/ci/azure-pipelines/steps/run.yml | 15 +--------------
 src/ci/scripts/should-skip-this.sh   | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100755 src/ci/scripts/should-skip-this.sh

diff --git a/src/ci/azure-pipelines/steps/run.yml b/src/ci/azure-pipelines/steps/run.yml
index f3339808567e7..b8e32cf2cdfe3 100644
--- a/src/ci/azure-pipelines/steps/run.yml
+++ b/src/ci/azure-pipelines/steps/run.yml
@@ -21,21 +21,8 @@ steps:
 - checkout: self
   fetchDepth: 2
 
-# Set the SKIP_JOB environment variable if this job is supposed to only run
-# when submodules are updated and they were not. The following time consuming
-# tasks will be skipped when the environment variable is present.
-- bash: |
-    set -e
-    # Submodules pseudo-files inside git have the 160000 permissions, so when
-    # those files are present in the diff a submodule was updated.
-    if git diff HEAD^ | grep "^index .* 160000" >/dev/null 2>&1; then
-        echo "Executing the job since submodules are updated"
-    else
-        echo "Not executing this job since no submodules were updated"
-        echo "##vso[task.setvariable variable=SKIP_JOB;]1"
-    fi
+- bash: src/ci/scripts/should-skip-this.sh
   displayName: Decide whether to run this job
-  condition: and(succeeded(), variables.CI_ONLY_WHEN_SUBMODULES_CHANGED)
 
 # Spawn a background process to collect CPU usage statistics which we'll upload
 # at the end of the build. See the comments in the script here for more
diff --git a/src/ci/scripts/should-skip-this.sh b/src/ci/scripts/should-skip-this.sh
new file mode 100755
index 0000000000000..a38099a2db7ff
--- /dev/null
+++ b/src/ci/scripts/should-skip-this.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Set the SKIP_JOB environment variable if this job is supposed to only run
+# when submodules are updated and they were not. The following time consuming
+# tasks will be skipped when the environment variable is present.
+
+set -euo pipefail
+IFS=$'\n\t'
+
+source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
+
+if [[ -z "${CI_ONLY_WHEN_SUBMODULES_CHANGED+x}" ]]; then
+    echo "Executing the job since there is no skip rule in effect"
+elif git diff HEAD^ | grep "^index .* 160000" >/dev/null 2>&1; then
+    # Submodules pseudo-files inside git have the 160000 permissions, so when
+    # those files are present in the diff a submodule was updated.
+    echo "Executing the job since submodules are updated"
+else
+    echo "Not executing this job since no submodules were updated"
+    ciCommandSetEnv SKIP_JOB 1
+fi