Skip to content

Commit f31974a

Browse files
authored
Rollup merge of #59257 - redox-os:upstream-redox, r=sanxiyn
Update CI configuration for building Redox libraries This fixes #59254
2 parents abdb773 + f8bffad commit f31974a

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

src/ci/docker/disabled/dist-x86_64-redox/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ COPY scripts/crosstool-ng.sh /scripts/
77
RUN sh /scripts/crosstool-ng.sh
88

99
WORKDIR /tmp
10-
COPY cross/install-x86_64-redox.sh /tmp/
11-
RUN ./install-x86_64-redox.sh
10+
COPY dist-various-1/install-x86_64-redox.sh /scripts/
11+
RUN sh /scripts/install-x86_64-redox.sh
1212

1313
COPY scripts/sccache.sh /scripts/
1414
RUN sh /scripts/sccache.sh

src/ci/docker/dist-various-1/install-x86_64-redox.sh

+2-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,5 @@
33

44
set -ex
55

6-
apt-get update
7-
apt-get install -y --no-install-recommends software-properties-common apt-transport-https
8-
9-
apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA12E97F0881517F
10-
add-apt-repository -y 'deb https://static.redox-os.org/toolchain/apt /'
11-
12-
apt-get update
13-
apt-get install -y x86-64-unknown-redox-gcc
6+
curl https://static.redox-os.org/toolchain/x86_64-unknown-redox/relibc-install.tar.gz | \
7+
tar --extract --gzip --directory /usr/local

0 commit comments

Comments
 (0)