Skip to content

Commit 8f95ae4

Browse files
committed
Remove LD_LIBRARY_PATH handling, nightly toolchain
1 parent 945536b commit 8f95ae4

File tree

3 files changed

+0
-29
lines changed

3 files changed

+0
-29
lines changed

.github/workflows/clippy.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
- name: rust-toolchain
3939
uses: actions-rs/toolchain@v1.0.6
4040
with:
41-
toolchain: nightly
4241
target: x86_64-unknown-linux-gnu
4342
profile: minimal
4443

@@ -56,12 +55,6 @@ jobs:
5655
restore-keys: |
5756
${{ runner.os }}-x86_64-unknown-linux-gnu
5857
59-
# Run
60-
- name: Set LD_LIBRARY_PATH (Linux)
61-
run: |
62-
SYSROOT=$(rustc --print sysroot)
63-
echo "LD_LIBRARY_PATH=${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" >> $GITHUB_ENV
64-
6558
- name: Build
6659
run: cargo build --features deny-warnings
6760

.github/workflows/clippy_bors.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ jobs:
8787
- name: rust-toolchain
8888
uses: actions-rs/toolchain@v1.0.6
8989
with:
90-
toolchain: nightly
9190
target: ${{ matrix.host }}
9291
profile: minimal
9392

@@ -106,23 +105,6 @@ jobs:
106105
${{ runner.os }}-${{ matrix.host }}
107106
108107
# Run
109-
- name: Set LD_LIBRARY_PATH (Linux)
110-
if: runner.os == 'Linux'
111-
run: |
112-
SYSROOT=$(rustc --print sysroot)
113-
echo "LD_LIBRARY_PATH=${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" >> $GITHUB_ENV
114-
- name: Link rustc dylib (MacOS)
115-
if: runner.os == 'macOS'
116-
run: |
117-
SYSROOT=$(rustc --print sysroot)
118-
sudo mkdir -p /usr/local/lib
119-
sudo find "${SYSROOT}/lib" -maxdepth 1 -name '*dylib' -exec ln -s {} /usr/local/lib \;
120-
- name: Set PATH (Windows)
121-
if: runner.os == 'Windows'
122-
run: |
123-
SYSROOT=$(rustc --print sysroot)
124-
echo "$SYSROOT/bin" >> $GITHUB_PATH
125-
126108
- name: Build with internal lints
127109
run: cargo build --features deny-warnings,internal-lints
128110

@@ -169,7 +151,6 @@ jobs:
169151
- name: rust-toolchain
170152
uses: actions-rs/toolchain@v1.0.6
171153
with:
172-
toolchain: nightly
173154
target: x86_64-unknown-linux-gnu
174155
profile: minimal
175156

@@ -247,7 +228,6 @@ jobs:
247228
- name: rust-toolchain
248229
uses: actions-rs/toolchain@v1.0.6
249230
with:
250-
toolchain: nightly
251231
target: x86_64-unknown-linux-gnu
252232
profile: minimal
253233

.github/workflows/clippy_dev.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ jobs:
2525
- name: rust-toolchain
2626
uses: actions-rs/toolchain@v1.0.6
2727
with:
28-
toolchain: nightly
2928
target: x86_64-unknown-linux-gnu
3029
profile: minimal
31-
components: rustfmt
3230

3331
- name: Checkout
3432
uses: actions/checkout@v2.3.3

0 commit comments

Comments
 (0)