Use yaml merge mapping correctly

At least, correctly as far as Ruby is concerned...
This commit is contained in:
Jean-Paul Calderone 2018-06-15 11:07:56 -04:00
parent 03bb4ef1a9
commit 69a7573745

View File

@ -124,13 +124,13 @@ jobs:
debian-9:
<<: *DEBIAN
docker:
- image: "debian:9"
<<: *DEBIAN
deprecations:
<<: *DEBIAN
docker:
- image: "debian:9"
@ -139,8 +139,6 @@ jobs:
# Select a tox environment to run for this job.
TAHOE_LAFS_TOX_ENVIRONMENT: "deprecations,upcoming-deprecations"
<<: *DEBIAN
ubuntu-16.04:
<<: *DEBIAN
@ -209,14 +207,14 @@ jobs:
- store_artifacts: *STORE_ARTIFACTS
fedora-27:
<<: *RHEL_DERIV
docker:
- image: "fedora:27"
<<: *RHEL_DERIV
fedora-28:
<<: *RHEL_DERIV
docker:
- image: "fedora:28"
<<: *RHEL_DERIV