Skip to content

Commit

Permalink
Recompile configs (3.10) (#7008)
Browse files Browse the repository at this point in the history
Recompiles standard and default configs using latest [email protected].

#7003
  • Loading branch information
dianabarsan authored Mar 17, 2021
1 parent 0c5a1ad commit afb4b53
Show file tree
Hide file tree
Showing 8 changed files with 2,862 additions and 3,350 deletions.
5 changes: 3 additions & 2 deletions config/default/app_settings.json

Large diffs are not rendered by default.

3,238 changes: 1,620 additions & 1,618 deletions config/default/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions config/default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
"test-targets": "npm run eslint && mocha --reporter progress test/targets/*.spec.js --timeout 10000",
"test-contact-summary": "npm run eslint && mocha --reporter progress test/contact-summary/*.spec.js --timeout 10000",
"test-unit": "mocha --recursive --reporter spec test --timeout 20000",
"travis": "npm run test-unit"
"travis": "./test/check-app-settings-is-committed && npm run test-unit"
},
"devDependencies": {
"chai": "^4.2.0",
"chai-exclude": "^1.0.8",
"chai-like": "^1.1.1",
"chai-things": "^0.2.0",
"eslint-plugin-json": "^2.0.1",
"medic-conf": "^3.1.0",
"medic-conf": "^3.4.1",
"medic-conf-test-harness": "^0.1.19",
"mocha": "^5.1.1",
"sinon": "^7.3.2"
Expand Down
2 changes: 1 addition & 1 deletion config/default/test/check-app-settings-is-committed
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ EOF
trap explain_error ERR

echo '[check-app-settings-js-is-committed] Generating app_settings.json...'
./node_modules/.bin/medic-conf --no-check compile-app-settings
./node_modules/.bin/medic-conf --local compile-app-settings

echo '[check-app-settings-js-is-committed] Check for changes...'
git diff --exit-code app_settings.json
Expand Down
4 changes: 2 additions & 2 deletions config/standard/app_settings.json

Large diffs are not rendered by default.

2,955 changes: 1,232 additions & 1,723 deletions config/standard/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/standard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"chai-exclude": "^1.0.8",
"eslint": "^6.5.1",
"eslint-plugin-json": "^1.3.2",
"medic-conf": "^3.1.0",
"medic-conf": "^3.4.1",
"medic-conf-test-harness": "^0.1.19",
"mocha": "^5.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion config/standard/test/check-app-settings-is-committed
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ EOF
trap explain_error ERR

echo '[check-app-settings-js-is-committed] Generating app_settings.json...'
./node_modules/.bin/medic-conf --no-check --local compile-app-settings
./node_modules/.bin/medic-conf --local compile-app-settings

echo '[check-app-settings-js-is-committed] Check for changes...'
git diff --exit-code app_settings.json
Expand Down

0 comments on commit afb4b53

Please sign in to comment.