Set GCC codegen backends in jobs.yml

Author: Kobzol

src/ci/docker/host-x86_64/x86_64-gnu-gcc-core-tests/Dockerfile

@@ -34,7 +34,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV CODEGEN_BACKENDS="gcc"
 ENV NO_DEBUG_ASSERTIONS="1"
 ENV RUSTFLAGS="-Cpanic=abort -Zpanic-abort-tests"
 ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \

src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile

@@ -34,7 +34,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV CODEGEN_BACKENDS="llvm,gcc"
 ENV NO_DEBUG_ASSERTIONS="1"
 ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \
  --enable-sanitizers \

src/ci/github-actions/jobs.yml

@@ -144,9 +144,13 @@ pr:
     <<: *job-linux-4c
   - name: x86_64-gnu-gcc
     doc_url: https://rustc-dev-guide.rust-lang.org/tests/codegen-backend-tests/cg_gcc.html
+    env:
+      CODEGEN_BACKENDS: llvm,gcc
     <<: *job-linux-4c
   - name: x86_64-gnu-gcc-core-tests
     doc_url: https://rustc-dev-guide.rust-lang.org/tests/codegen-backend-tests/cg_gcc.html
+    env:
+      CODEGEN_BACKENDS: gcc
     <<: *job-linux-4c
 
 # Jobs that run when you perform a try build (@bors try)
@@ -361,14 +365,6 @@ auto:
     continue_on_error: true
     <<: *job-linux-4c
 
-  - name: x86_64-gnu-gcc
-    doc_url: https://rustc-dev-guide.rust-lang.org/tests/codegen-backend-tests/cg_gcc.html
-    <<: *job-linux-4c
-
-  - name: x86_64-gnu-gcc-core-tests
-    doc_url: https://rustc-dev-guide.rust-lang.org/tests/codegen-backend-tests/cg_gcc.html
-    <<: *job-linux-4c
-
   # This job ensures commits landing on nightly still pass the full
   # test suite on the stable channel. There are some UI tests that
   # depend on the channel being built (for example if they include the

src/ci/run.sh

@@ -59,7 +59,8 @@ if [ "$FORCE_CI_RUSTC" == "" ]; then
 fi
 
 if [[ "$RUST_CONFIGURE_ARGS" == *"rust.codegen-backends"* ]]; then
-  echo "error: Please specify codegen backends using the CODEGEN_BACKENDS environment variable, not via RUST_CONFIGURE_ARGS."
+  echo "error: Please specify codegen backends using the CODEGEN_BACKENDS environment variable, \
+not via RUST_CONFIGURE_ARGS."
   exit 1
 fi