diff options
author | bors <bors@rust-lang.org> | 2023-05-15 15:16:29 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2023-05-15 15:16:29 +0000 |
commit | 586541b97e047cfec540fad752bc1eaca4acac36 (patch) | |
tree | 542bee1edd6fe3ac67d97425e7ecd2c57ad98eb3 /ci | |
parent | d1df7024408f3c103d7d80fec4b25e165890afa1 (diff) | |
parent | 07f7c83349a5af80dcbb80ac6f2a8a12dbfdb97b (diff) | |
download | rust-libc-586541b97e047cfec540fad752bc1eaca4acac36.tar.gz |
Auto merge of #3249 - joshtriplett:switch-to-main, r=Amanieu
Change branch references to HEAD where possible or main otherwise
This updates CI, documentation, and similar to work with a `main`
branch. It also renames references to *other* repositories to work, as
well, which additionally makes it easier to search for remaining
references.
I verified that all modified links still work.
Diffstat (limited to 'ci')
-rw-r--r-- | ci/README.md | 6 | ||||
-rw-r--r-- | ci/linux-s390x.sh | 2 | ||||
-rw-r--r-- | ci/rust.css | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ci/README.md b/ci/README.md index c0de4f9ede..c8c23cfc94 100644 --- a/ci/README.md +++ b/ci/README.md @@ -42,9 +42,9 @@ The remaining architectures look like: * The BSD builds, currently OpenBSD and FreeBSD, use QEMU to boot up a system and compile/run tests. More information on that below. -[Actions config]: https://github.com/rust-lang/libc/tree/master/.github/workflows -[Cirrus config]: https://github.com/rust-lang/libc/blob/master/.cirrus.yml -[android-docker]: https://github.com/rust-lang/libc/blob/master/ci/docker/x86_64-linux-android/Dockerfile +[Actions config]: https://github.com/rust-lang/libc/tree/HEAD/.github/workflows +[Cirrus config]: https://github.com/rust-lang/libc/blob/HEAD/.cirrus.yml +[android-docker]: https://github.com/rust-lang/libc/blob/HEAD/ci/docker/x86_64-linux-android/Dockerfile ## QEMU diff --git a/ci/linux-s390x.sh b/ci/linux-s390x.sh index 68324befb3..0eafa6b583 100644 --- a/ci/linux-s390x.sh +++ b/ci/linux-s390x.sh @@ -5,7 +5,7 @@ set -ex mkdir -m 777 /qemu cd /qemu -curl --retry 5 -LO https://github.com/qemu/qemu/raw/master/pc-bios/s390-ccw.img +curl --retry 5 -LO https://github.com/qemu/qemu/raw/HEAD/pc-bios/s390-ccw.img curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20220914/images/generic/kernel.debian curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20220914/images/generic/initrd.debian diff --git a/ci/rust.css b/ci/rust.css index d33e36e60c..8dfeb6e7ac 100644 --- a/ci/rust.css +++ b/ci/rust.css @@ -1,4 +1,4 @@ -/* This is taken from https://github.com/rust-lang/rust/blob/master/src/doc/rust.css */ +/* This is taken from https://github.com/rust-lang/rust/blob/HEAD/src/doc/rust.css */ @font-face { font-family: 'Fira Sans'; |