From b0d25de54a62451cb5699080b69219ac12247023 Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Wed, 12 Feb 2020 11:02:07 +0100
Subject: [PATCH 1/2] Use list instead of array for branch names

This is the officially supported method
---
 .github/workflows/clippy.yml      | 4 +++-
 .github/workflows/clippy_bors.yml | 4 +++-
 .github/workflows/clippy_dev.yml  | 4 +++-
 .github/workflows/deploy.yml      | 6 ++++--
 .github/workflows/remark.yml      | 4 +++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index 0d7d2929000b..6a9f64e88bdb 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -3,7 +3,9 @@ name: Clippy Test
 on:
   push:
     # Ignore bors branches, since they are covered by `clippy_bors.yml`
-    branches-ignore: [auto, try]
+    branches-ignore:
+      - auto
+      - try
     # Don't run Clippy tests, when only textfiles were modified
     paths-ignore:
     - 'COPYRIGHT'
diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml
index d147e0790a0a..f77350f09b94 100644
--- a/.github/workflows/clippy_bors.yml
+++ b/.github/workflows/clippy_bors.yml
@@ -2,7 +2,9 @@ name: Clippy Test (bors)
 
 on:
   push:
-    branches: [auto, try]
+    branches:
+      - auto
+      - try
 
 env:
   RUST_BACKTRACE: 1
diff --git a/.github/workflows/clippy_dev.yml b/.github/workflows/clippy_dev.yml
index d6f5db014a43..9ca2e630cbbb 100644
--- a/.github/workflows/clippy_dev.yml
+++ b/.github/workflows/clippy_dev.yml
@@ -2,7 +2,9 @@ name: Clippy Dev Test
 
 on:
   push:
-    branches: [auto, try]
+    branches:
+      - auto
+      - try
   pull_request:
     # Only run on paths, that get checked by the clippy_dev tool
     paths:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6f79891358eb..93300b6e124f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -2,9 +2,11 @@ name: Deploy
 
 on:
   push:
-    branches: master
+    branches:
+      - master
   release:
-    types: [created]
+    types:
+      - created
 
 env:
   TARGET_BRANCH: 'gh-pages'
diff --git a/.github/workflows/remark.yml b/.github/workflows/remark.yml
index 3544053d399a..cc175e8bf247 100644
--- a/.github/workflows/remark.yml
+++ b/.github/workflows/remark.yml
@@ -2,7 +2,9 @@ name: Remark
 
 on:
   push:
-    branches: [auto, try]
+    branches:
+      - auto
+      - try
   pull_request:
     paths:
     - '**.md'

From b900aafbc4e212675432d11d8ca6ccdd20ebe43d Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Wed, 12 Feb 2020 11:16:41 +0100
Subject: [PATCH 2/2] Set LD_LIBRARY_PATH in integration tests

Why did this work before on like 20 runs?
---
 .github/workflows/clippy_bors.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml
index f77350f09b94..6e8b41d275b5 100644
--- a/.github/workflows/clippy_bors.yml
+++ b/.github/workflows/clippy_bors.yml
@@ -202,6 +202,11 @@ jobs:
       run: bash setup-toolchain.sh
 
     # Run
+    - name: Set LD_LIBRARY_PATH (Linux)
+      run: |
+        SYSROOT=$(rustc --print sysroot)
+        echo "::set-env name=LD_LIBRARY_PATH::${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
+
     - name: Build Integration Test
       run: cargo test --test integration --features integration --no-run
 
@@ -291,6 +296,11 @@ jobs:
       run: chmod +x $CARGO_TARGET_DIR/debug/*
 
     # Run
+    - name: Set LD_LIBRARY_PATH (Linux)
+      run: |
+        SYSROOT=$(rustc --print sysroot)
+        echo "::set-env name=LD_LIBRARY_PATH::${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
+
     - name: Test ${{ matrix.integration }}
       run: $CARGO_TARGET_DIR/debug/integration
       env: