Skip to content

Commit afb4b53

Browse files
authored
Recompile configs (3.10) (#7008)
Recompiles standard and default configs using latest [email protected]. #7003
1 parent 0c5a1ad commit afb4b53

File tree

8 files changed

+2862
-3350
lines changed

8 files changed

+2862
-3350
lines changed

config/default/app_settings.json

Lines changed: 3 additions & 2 deletions
Large diffs are not rendered by default.

config/default/package-lock.json

Lines changed: 1620 additions & 1618 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/default/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"test-targets": "npm run eslint && mocha --reporter progress test/targets/*.spec.js --timeout 10000",
1414
"test-contact-summary": "npm run eslint && mocha --reporter progress test/contact-summary/*.spec.js --timeout 10000",
1515
"test-unit": "mocha --recursive --reporter spec test --timeout 20000",
16-
"travis": "npm run test-unit"
16+
"travis": "./test/check-app-settings-is-committed && npm run test-unit"
1717
},
1818
"devDependencies": {
1919
"chai": "^4.2.0",
2020
"chai-exclude": "^1.0.8",
2121
"chai-like": "^1.1.1",
2222
"chai-things": "^0.2.0",
2323
"eslint-plugin-json": "^2.0.1",
24-
"medic-conf": "^3.1.0",
24+
"medic-conf": "^3.4.1",
2525
"medic-conf-test-harness": "^0.1.19",
2626
"mocha": "^5.1.1",
2727
"sinon": "^7.3.2"

config/default/test/check-app-settings-is-committed

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ EOF
1515
trap explain_error ERR
1616

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

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

config/standard/app_settings.json

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

config/standard/package-lock.json

Lines changed: 1232 additions & 1723 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/standard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"chai-exclude": "^1.0.8",
1919
"eslint": "^6.5.1",
2020
"eslint-plugin-json": "^1.3.2",
21-
"medic-conf": "^3.1.0",
21+
"medic-conf": "^3.4.1",
2222
"medic-conf-test-harness": "^0.1.19",
2323
"mocha": "^5.1.1"
2424
},

config/standard/test/check-app-settings-is-committed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ EOF
1515
trap explain_error ERR
1616

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

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

0 commit comments

Comments
 (0)