Skip to content

Commit

Permalink
Rollup merge of #136628 - heiher:crosstool-ng-1.27, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history 
ci: upgrade to crosstool-ng 1.27.0

try-job: dist-loongarch64-linux
try-job: dist-loongarch64-musl
try-job: dist-powerpc64le-linux
  • Loading branch information
@matthiaskrgr
matthiaskrgr authored Feb 10, 2025
2 parents 78f5bdd + ed2823c commit 111726c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 24 deletions.
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/dist-loongarch64-linux/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM ubuntu:22.04
COPY scripts/cross-apt-packages.sh /scripts/
RUN sh /scripts/cross-apt-packages.sh

COPY scripts/crosstool-ng-git.sh /scripts/
RUN sh /scripts/crosstool-ng-git.sh
COPY scripts/crosstool-ng.sh /scripts/
RUN sh /scripts/crosstool-ng.sh

COPY scripts/rustbuild-setup.sh /scripts/
RUN sh /scripts/rustbuild-setup.sh
Expand Down
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM ubuntu:22.04
COPY scripts/cross-apt-packages.sh /scripts/
RUN sh /scripts/cross-apt-packages.sh

COPY scripts/crosstool-ng-git.sh /scripts/
RUN sh /scripts/crosstool-ng-git.sh
COPY scripts/crosstool-ng.sh /scripts/
RUN sh /scripts/crosstool-ng.sh

COPY scripts/rustbuild-setup.sh /scripts/
RUN sh /scripts/rustbuild-setup.sh
Expand Down
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/dist-powerpc64le-linux/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM ubuntu:22.04
COPY scripts/cross-apt-packages.sh /scripts/
RUN sh /scripts/cross-apt-packages.sh

COPY scripts/crosstool-ng-git.sh /scripts/
RUN sh /scripts/crosstool-ng-git.sh
COPY scripts/crosstool-ng.sh /scripts/
RUN sh /scripts/crosstool-ng.sh

COPY scripts/rustbuild-setup.sh /scripts/
RUN sh /scripts/rustbuild-setup.sh
Expand Down
17 changes: 0 additions & 17 deletions src/ci/docker/scripts/crosstool-ng-git.sh
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/ci/docker/scripts/crosstool-ng.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
set -ex

CT_NG=1.26.0
CT_NG=1.27.0

url="https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-$CT_NG.tar.gz"
curl -Lf $url | tar xzf -
Expand Down

0 comments on commit 111726c

Please sign in to comment.