Skip to content

Commit 5c883ee

Browse files
committed
Auto merge of #5162 - flip1995:gha_fix, r=<try>
Fix GHA after the merge changelog: none
2 parents 71a5379 + b900aaf commit 5c883ee

File tree

5 files changed

+26
-6
lines changed

5 files changed

+26
-6
lines changed

.github/workflows/clippy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ name: Clippy Test
33
on:
44
push:
55
# Ignore bors branches, since they are covered by `clippy_bors.yml`
6-
branches-ignore: [auto, try]
6+
branches-ignore:
7+
- auto
8+
- try
79
# Don't run Clippy tests, when only textfiles were modified
810
paths-ignore:
911
- 'COPYRIGHT'

.github/workflows/clippy_bors.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Clippy Test (bors)
22

33
on:
44
push:
5-
branches: [auto, try]
5+
branches:
6+
- auto
7+
- try
68

79
env:
810
RUST_BACKTRACE: 1
@@ -200,6 +202,11 @@ jobs:
200202
run: bash setup-toolchain.sh
201203

202204
# Run
205+
- name: Set LD_LIBRARY_PATH (Linux)
206+
run: |
207+
SYSROOT=$(rustc --print sysroot)
208+
echo "::set-env name=LD_LIBRARY_PATH::${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
209+
203210
- name: Build Integration Test
204211
run: cargo test --test integration --features integration --no-run
205212

@@ -289,6 +296,11 @@ jobs:
289296
run: chmod +x $CARGO_TARGET_DIR/debug/*
290297

291298
# Run
299+
- name: Set LD_LIBRARY_PATH (Linux)
300+
run: |
301+
SYSROOT=$(rustc --print sysroot)
302+
echo "::set-env name=LD_LIBRARY_PATH::${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
303+
292304
- name: Test ${{ matrix.integration }}
293305
run: $CARGO_TARGET_DIR/debug/integration
294306
env:

.github/workflows/clippy_dev.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Clippy Dev Test
22

33
on:
44
push:
5-
branches: [auto, try]
5+
branches:
6+
- auto
7+
- try
68
pull_request:
79
# Only run on paths, that get checked by the clippy_dev tool
810
paths:

.github/workflows/deploy.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ name: Deploy
22

33
on:
44
push:
5-
branches: master
5+
branches:
6+
- master
67
release:
7-
types: [created]
8+
types:
9+
- created
810

911
env:
1012
TARGET_BRANCH: 'gh-pages'

.github/workflows/remark.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Remark
22

33
on:
44
push:
5-
branches: [auto, try]
5+
branches:
6+
- auto
7+
- try
68
pull_request:
79
paths:
810
- '**.md'

0 commit comments

Comments
 (0)