Skip to content

Commit ec050a3

Browse files
committed
Remove Linux image from mips-unknown-linux-gnu.
1 parent 6dbdac1 commit ec050a3

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

.changes/591.json

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
{
2-
"description": "Update Ubuntu images to 20.04 LTS.",
3-
"type": "changed",
4-
"breaking": true,
5-
"issues": [417, 517, 556, 616]
6-
}
1+
[
2+
{
3+
"description": "update Ubuntu images to 20.04 LTS.",
4+
"type": "changed",
5+
"breaking": true,
6+
"issues": [417, 517, 556, 616]
7+
},
8+
{
9+
"description": "remove Linux image from `mips-unknown-linux-gnu`.",
10+
"type": "removed",
11+
"breaking": true
12+
}
13+
]

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
- { target: thumbv7neon-unknown-linux-gnueabihf, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
164164
- { target: i586-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1 }
165165
- { target: i686-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: native qemu-user qemu-system }
166-
- { target: mips-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
166+
- { target: mips-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user }
167167
- { target: mipsel-unknown-linux-gnu, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
168168
- { target: mips64-unknown-linux-gnuabi64, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1 }
169169
- { target: mips64el-unknown-linux-gnuabi64, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }

docker/Dockerfile.mips-unknown-linux-gnu

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,12 @@ RUN apt-get install --assume-yes --no-install-recommends \
1515
libc6-dev-mips-cross
1616

1717
COPY qemu.sh /
18-
RUN /qemu.sh mips softmmu
18+
RUN /qemu.sh mips
1919

20-
COPY dropbear.sh /
21-
RUN /dropbear.sh
22-
23-
COPY linux-image.sh /
24-
RUN /linux-image.sh mips
25-
26-
COPY linux-runner /
20+
COPY qemu-runner /
2721

2822
ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \
29-
CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner mips" \
23+
CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_RUNNER="/qemu-runner mips" \
3024
CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc \
3125
CXX_mips_unknown_linux_gnu=mips-linux-gnu-g++ \
3226
BINDGEN_EXTRA_CLANG_ARGS_mips_unknown_linux_gnu="--sysroot=/usr/mips-linux-gnu" \

0 commit comments

Comments
 (0)