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 /.github | |
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 '.github')
-rw-r--r-- | .github/workflows/bors.yml | 22 | ||||
-rw-r--r-- | .github/workflows/docs.yml | 2 | ||||
-rw-r--r-- | .github/workflows/main.yml | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index c295f332ae..677d96b4bf 100644 --- a/.github/workflows/bors.yml +++ b/.github/workflows/bors.yml @@ -23,7 +23,7 @@ jobs: x86_64-unknown-linux-gnu, ] steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -46,7 +46,7 @@ jobs: x86_64-apple-darwin, ] steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -81,7 +81,7 @@ jobs: # ARCH: i686 - target: i686-pc-windows-msvc steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -103,7 +103,7 @@ jobs: name: Style check runs-on: ubuntu-22.04 steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -163,7 +163,7 @@ jobs: # x86_64-unknown-redox, ] steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -191,7 +191,7 @@ jobs: armv7-unknown-linux-uclibceabihf ] steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -210,7 +210,7 @@ jobs: needs: [docker_linux_tier1, style_check] runs-on: ubuntu-22.04 steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -244,7 +244,7 @@ jobs: 1.30.0, ] steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -277,7 +277,7 @@ jobs: - { toolchain: 1.30.0, os: macos-11 } runs-on: ${{ matrix.target.os }} steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -321,7 +321,7 @@ jobs: name: "Check #[cfg]s" runs-on: ubuntu-22.04 steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 @@ -339,7 +339,7 @@ jobs: runs-on: ubuntu-22.04 needs: docker_linux_tier2 steps: - - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD with: github_token: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/checkout@v3 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 50102b83ec..29de18db19 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: Upload documentation to GitHub Pages on: push: branches: - - master + - main # Sets permissions of `GITHUB_TOKEN` to allow deployment to GitHub Pages permissions: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 635d6121e6..91c07cad41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: types: [opened, synchronize, reopened] push: branches: - - master + - main permissions: contents: read # to fetch code (actions/checkout) |