Auto merge of #1965 - JohnTitor:gha-ubuntu-20, r=JohnTitor

Update GHA Ubuntu version to 20.04

Author: bors

.github/workflows/bors.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   docker_linux_tier1:
     name: Docker Linux Tier1
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
       matrix:
@@ -81,7 +81,7 @@ jobs:
 
   style_check:
     name: Style check
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
     steps:
@@ -97,7 +97,7 @@ jobs:
   docker_linux_tier2:
     name: Docker Linux Tier2
     needs: [docker_linux_tier1, style_check]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
       max-parallel: 12
@@ -149,7 +149,7 @@ jobs:
   docker_switch:
     name: Docker Switch
     needs: [docker_linux_tier1, style_check]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
     steps:
@@ -165,7 +165,7 @@ jobs:
   build_channels_linux:
     name: Build Channels Linux
     needs: docker_linux_tier2
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       OS: linux
     strategy:
@@ -225,7 +225,7 @@ jobs:
   semver_linux:
     name: Semver Linux
     needs: build_channels_linux
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
     steps:
@@ -258,7 +258,7 @@ jobs:
 
   docs:
     name: Generate documentation
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     needs: docker_linux_tier2
     strategy:
       fail-fast: true
@@ -281,7 +281,7 @@ jobs:
   end_success:
     name: bors build finished
     if: github.event.pusher.name == 'bors' && success()
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     needs: [
       docker_linux_tier1,
       docker_linux_tier2,
@@ -303,7 +303,7 @@ jobs:
   end_failure:
     name: bors build finished
     if: github.event.pusher.name == 'bors' && (failure() || cancelled())
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     needs: [
       docker_linux_tier1,
       docker_linux_tier2,

.github/workflows/docs.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   upload_docs:
     name: Upload documentation
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'rust-lang/libc'
 
     steps:

.github/workflows/main.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   docker_linux_tier1:
     name: Docker Linux Tier1
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
       matrix:
@@ -73,7 +73,7 @@ jobs:
 
   style_check:
     name: Style check
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
     steps:

ci/install-rust.sh

@@ -47,13 +47,13 @@ if [ "$OS" = "windows" ]; then
 fi
 
 echo "Query rust and cargo versions"
+command -v rustc
+command -v cargo
+command -v rustup
 rustc -Vv
 cargo -V
 rustup -Vv
 rustup show
-which rustc
-which cargo
-which rustup
 
 echo "Generate lockfile"
 N=5

ci/run-docker.sh

@@ -62,7 +62,7 @@ build_switch() {
         kvm=""
     fi
 
-    cp "$(which rustup)" "$(rustc --print sysroot)/bin"
+    cp "$(command -v rustup)" "$(rustc --print sysroot)/bin"
 
     docker run \
       --rm \

ci/style.sh

@@ -4,11 +4,11 @@ set -ex
 
 rustc ci/style.rs && ./style src
 
-if rustup component add rustfmt-preview ; then
-    command -v rustfmt
-    rustfmt -V
-    cargo fmt --all -- --check
-fi
+rustup toolchain install nightly -c rustfmt --allow-downgrade
+rustup override set nightly
+command -v rustfmt
+rustfmt -V
+cargo fmt --all -- --check
 
 if shellcheck --version ; then
     # GHA's shellcheck is too old (0.4.6) and cannot handle SC2153 correctly.