Skip to content

Commit

Permalink
Update Rust versions in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
joshtriplett committed Aug 4, 2022
1 parent 36d0321 commit 71ff679
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 31 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,6 @@ jobs:
stable,
beta,
nightly,
1.13.0,
1.19.0,
1.24.0,
1.25.0,
1.30.0,
]
steps:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
Expand All @@ -234,11 +229,6 @@ jobs:
stable,
beta,
nightly,
1.13.0,
1.19.0,
1.24.0,
1.25.0,
1.30.0,
]
steps:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
Expand All @@ -259,10 +249,6 @@ jobs:
fail-fast: true
matrix:
toolchain: [
1.19.0,
1.24.0,
1.25.0,
1.30.0,
stable,
]
steps:
Expand Down
17 changes: 0 additions & 17 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,22 +116,15 @@ x86_64-unknown-freebsd \
x86_64-unknown-linux-gnu \
x86_64-unknown-linux-musl \
x86_64-unknown-netbsd \
"

RUST_GT_1_13_LINUX_TARGETS="\
arm-unknown-linux-musleabi \
arm-unknown-linux-musleabihf \
armv7-unknown-linux-musleabihf \
sparc64-unknown-linux-gnu \
wasm32-unknown-emscripten \
x86_64-linux-android \
"
RUST_GT_1_19_LINUX_TARGETS="\
aarch64-unknown-linux-musl \
sparcv9-sun-solaris \
wasm32-unknown-unknown \
"
RUST_GT_1_24_LINUX_TARGETS="\
i586-unknown-linux-musl \
"

Expand Down Expand Up @@ -174,16 +167,6 @@ case "${OS}" in
linux*)
TARGETS="${RUST_LINUX_TARGETS}"

if [ "${RUST}" != "1.13.0" ]; then
TARGETS="${TARGETS} ${RUST_GT_1_13_LINUX_TARGETS}"
if [ "${RUST}" != "1.19.0" ]; then
TARGETS="${TARGETS} ${RUST_GT_1_19_LINUX_TARGETS}"
if [ "${RUST}" != "1.24.0" ]; then
TARGETS="${TARGETS} ${RUST_GT_1_24_LINUX_TARGETS}"
fi
fi
fi

if [ "${RUST}" = "nightly" ]; then
TARGETS="${TARGETS} ${RUST_NIGHTLY_LINUX_TARGETS}"
fi
Expand Down

0 comments on commit 71ff679

Please sign in to comment.