Skip to content

Commit

Permalink
[internal] Rename pants CI config file to not be specific to travis
Browse files Browse the repository at this point in the history
Since we use it to configure pants when running under Github Actions too.
  • Loading branch information
asherf committed Mar 3, 2021
1 parent b2fbce0 commit 31cfb76
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Expand Up @@ -111,7 +111,7 @@ jobs:
${{ runner.os }}-engine-${{ steps.get-engine-hash.outputs.hash }}
- name: Set env vars
run: |
echo "PANTS_CONFIG_FILES=${{ github.workspace }}/pants.travis-ci.toml" >> ${GITHUB_ENV}
echo "PANTS_CONFIG_FILES=${{ github.workspace }}/pants.ci.toml" >> ${GITHUB_ENV}
- name: Bootstrap Pants
run: |
./pants --version
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -14,7 +14,7 @@ deploy:
skip_cleanup: true
env:
global:
- PANTS_CONFIG_FILES="${TRAVIS_BUILD_DIR}/pants.travis-ci.toml"
- PANTS_CONFIG_FILES="${TRAVIS_BUILD_DIR}/pants.ci.toml"
- PANTS_DYNAMIC_UI=false
- LC_ALL="en_US.UTF-8"
- AWS_BUCKET=ci-public.pantsbuild.org
Expand Down
2 changes: 1 addition & 1 deletion build-support/bin/generate_travis_yml.py
Expand Up @@ -68,7 +68,7 @@ def all_entries(cls) -> List[Dict[str, str]]:
# NB: These are not applied to the Linux Docker image - all of those env vars must be explicitly
# exported in the image.
GLOBAL_ENV_VARS = [
'PANTS_CONFIG_FILES="${TRAVIS_BUILD_DIR}/pants.travis-ci.toml"',
'PANTS_CONFIG_FILES="${TRAVIS_BUILD_DIR}/pants.ci.toml"',
"PANTS_DYNAMIC_UI=false",
'LC_ALL="en_US.UTF-8"',
"AWS_BUCKET=ci-public.pantsbuild.org",
Expand Down
File renamed without changes.

0 comments on commit 31cfb76

Please sign in to comment.