ps-error-on-config-from-both-env-and-file Config should raise an error if both file and env configs ar…

We use file configs for some apps and ENV config for the others. When
both configs are available (for example because someone accidentally set
an ENV config where file config is already set), Travis.config will
silently prefer ENV over file config.

This commit raises an error in such situation

Piotr Sarnacki authored and committed

Push event #2786 passed

  • Ran for
  • Total time
The .travis.yml file used for this job is not available
Build Config
{
  "env": {
    "global": [
      "RUBY_GC_MALLOC_LIMIT=90000000",
      "RUBY_FREE_MIN=200000"
    ]
  },
  "jdk": [
    "oraclejdk7",
    "openjdk6"
  ],
  "rvm": [
    "jruby-19mode"
  ],
  "matrix": {
    "include": [
      {
        "jdk": null,
        "rvm": "1.9.3"
      },
      {
        "jdk": null,
        "rvm": "2.0.0"
      },
      {
        "jdk": null,
        "rvm": "rbx-2.1.1"
      }
    ],
    "allow_failures": [
      {
        "jdk": null,
        "rvm": "rbx-2.1.1"
      }
    ]
  },
  "script": [
    "./build.sh"
  ],
  "language": "ruby",
  "services": [
    "redis"
  ],
  "before_script": [
    "sudo service mysql stop",
    "redis-cli config set save \"\"",
    "RAILS_ENV=test rake db:create db:schema:load --trace"
  ],
  "notifications": {
    "irc": "irc.freenode.org#travis"
  }
}