081db3a240
* Update ember-cli to ~3.20 * Remove bad optional-feature * Remove ember-fetch dep * re-install ember-fetch * update model fragments pr * update ember model fragments correct package name * update ember composable helpers to solve array helper error * update ember-concurrency * add back engine dependencies, automatically removed during ember-cli-upgrade * make author-form-options component js file otherwise error * for now comment out withTestWaiter * add eslint-node and fix if not with unless in templates * fix linting for tab index of false is now -1 and add type button to all buttons without types * fix href errors for linting, likely have to come back and fix * using eslint fix flag to fix all this.gets * ember modules codemode removed files that had module twice, will fix in next commit * finish codemode ember-data-codemod needed to rename const model * more this.get removal codemode did not work * cont. removal of this.get * stop mixin rules until figure out how to reconfig them all * smaller eslint ignores * get codemode * testing app small fixes to bring it back after all the changes * small changes to eslint * test removal of getProperties * fix issue with baseKey because value could be unknown needed to add a question mark in nested get * smaller linting fixes * get nested fixes * small linting error fixes * small linting changes * working through more small linting changes * another round of linting modifications * liniting fixes * ember module codemod * quinit dom codemod * angle bracket codemod * discovered that components must have js files * ran all codemods this is all that's left * small changes to fix get needs two object, should not have been using get. * fix issue with one input in form field * fun times with set and onChange from oninput * fix issue with model not being passed through on secret-edit-display * fix issue with yarn run test not working, revert without npm run all * linting and small fix when loading without a selectAuthBackend * fix failing test with ui-wizard issue * fix test failure due to model not being asked for correctly with new changes, probably run into this more. * fix issue with component helper and at props specific to wizard * rename log to clilog due to conflict with new eslint rule * small changes for test failures * component helper at fixes * Revert to old component style something with new one broke this and can't figure it out for now * small fishy smelling test fixes will revisit * small test changes * more small test changes, appears upgrade treats spaces differently * comment out code and test that no longer seems relevant but confirm * clean run on component test though still some potential timing issues on ui-console test * fixing one auth test issue and timing issue on enable-test * small mods * fix this conditional check from upgrade * linting fixes after master merge * package updates using yarn upgrade-interactive * update libraries that did not effect any of the test failures. * update ember truth helpers library * settling tests * Fix ui-panel control group output * fix features selection test failures * Fix auth tests (x-vault-token) * fix shared test * fix issue with data null on backend * Revert "Fix auth tests (x-vault-token)" This reverts commit 89cb174b2f1998efa56d9604d14131415ae65d6f. * Fix auth tests (x-vault-token) without updating this.set * Update redirect-to tests * fix wrapped token test * skip some flaky test * fix issue with href and a tags vs buttons * fix linting * updates to get tests running (#10409) * yarn isntall * increasing resource_class * whoops * trying large * back to xlarge * Fix param issue on transform item routes * test fixes * settle on policies (old) test * fix browserstack test warning and skips of test confirmed worked * Fix redirect-to test * skips * fix transformation test and skip some kmip * Skip tests * Add meep marker to remaining failing tests * Skip test with failing component * rever skip on secret-create test * Skip piece of test that fails due to navigation-input * fix settings test where can and skip in others after confirming * fix circle ci test failures * ssh role settle * Fix navigate-input and add settled to test * Remove extra import * secret cubbyhole and alicloud * Add settled to gcpkms test * settles on redirect to test * Bump browserstack test resource to large * Update browserstack resource size to xlarge * update todos * add back in withTestWaiter * try and fix credentials conditional action added comment instead * Update volatile computed properies to get functions * this step was never reached and we never defined secretType anywhere so I removed * add settled to policy old test * Fix navigate-input on policies and leases * replace ssh test with no var hoping that helps and add settled to other failing tests, unskip console tests * kmip, transit, role test remove a skip and add in settled * fix hover copy button, had to remove some testing functionality * Remove private router service * remove skip on control ssh and ui panel, fix search select by restructuring how to read the error * final bit of working through skipped test * Replace clearNonGlobalModels by linking directly to namespace with href-to * Remove unused var * Fix role-ssh id bug by updating form-field-from-model to form-field-group-loop * Fix transit create id would not update * Update option toggle selector for ssh-role * Fix ssh selector * cleanup pt1 * small clean up * cleanup part2 * Fix computed on pricing-metrics-form * small cleanup based on chelseas comments. Co-authored-by: Chelsea Shaw <chelshaw.dev@gmail.com> Co-authored-by: Sarah Thompson <sthompson@hashicorp.com> |
||
---|---|---|
.. | ||
config | ||
.gitattributes | ||
.gitignore | ||
Makefile | ||
README.md | ||
config.yml |
README.md
How to use CircleCI multi-file config
This README and the Makefile should be in your .circleci
directory,
in the root of your repository.
All path references in this README assume we are in this .circleci
directory.
The Makefile
in this directory generates ./config.yml
in CircleCI 2.0 syntax,
from the tree rooted at ./config/
, which contains files in CircleCI 2.0 or 2.1 syntax.
Quickstart
The basic workflow is:
- Edit source files in
./config/
- When you are done, run
make ci-config
to update./config.yml
- Commit this entire
.circleci
directory, including that generated file together. - Run
make ci-verify
to ensure the current./config.yml
is up to date with the source.
When merging this .circleci
directory:
- Do not merge the generated
./config.yml
file, instead: - Merge the source files under
./config/
, and then - Run
make ci-config
to re-generate the merged./config.yml
And that's it, for more detail, read on!
How does it work, roughly?
CircleCI supports generating a single config file from many,
using the $ circleci config pack
command.
It also supports expanding 2.1 syntax to 2.0 syntax
using the $ circleci config process
command.
We use these two commands, stitched together using the Makefile
to implement the workflow.
Prerequisites
You will need the CircleCI CLI tool installed and working,
at least version 0.1.5607
.
You can download this tool directly from GitHub Releases.
$ circleci version
0.1.5607+f705856
Updating the config source
Before making changes, be sure to understand the layout
of the ./config/
file tree, as well as circleci 2.1 syntax.
See the Syntax and layout section below.
To update the config, you should edit, add or remove files
in the ./config/
directory,
and then run make ci-config
.
If that's successful,
you should then commit every *.yml
file in the tree rooted in this directory.
That is: you should commit both the source under ./config/
and the generated file ./config.yml
at the same time, in the same commit.
The included git pre-commit hook will help with this.
Do not edit the ./config.yml
file directly, as you will lose your changes
next time make ci-config
is run.
Verifying ./config.yml
To check whether or not the current ./config.yml
is up to date with the source
and valid, run $ make ci-verify
.
Note that $ make ci-verify
should be run in CI,
in case not everyone has the git pre-commit hook set up correctly.
Example shell session
$ make ci-config
config.yml updated
$ git add -A . # The -A makes sure to include deletions/renames etc.
$ git commit -m "ci: blah blah blah"
Changes detected in .circleci/, running 'make -C .circleci ci-verify'
--> Generated config.yml is up to date!
--> Config file at config.yml is valid.
Syntax and layout
It is important to understand the layout of the config directory. Read the documentation on packing a config for a full understanding of how multiple YAML files are merged by the circleci CLI tool.
Here is an example file tree (with comments added afterwards):
$ tree .
.
├── Makefile
├── README.md # This file.
├── config # The source code for config.yml is rooted here.
│ ├── @config.yml # Files beginning with @ are treated specially by `circleci config pack`
│ ├── commands # Subdirectories of config become top-level keys.
│ │ └── go_test.yml # Filenames (minus .yml) become top-level keys under
│ │ └── go_build.yml # their parent (in this case "commands").
│ │ # The contents of go_test.yml therefore are placed at: .commands.go_test:
│ └── jobs # jobs also becomes a top-level key under config...
│ ├── build.yml # ...and likewise filenames become keys under their parent.
│ └── test.yml
└── config.yml # The generated file in 2.0 syntax.
About those @
files... Preceding a filename with @
indicates to $ circleci config pack
that the contents of this YAML file
should be at the top-level, rather than underneath a key named after their filename.
This naming convention is unfortunate as it breaks autocompletion in bash,
but there we go.