test, trying to fix it

medic · Nov 27, 2024 · 900041f · 900041f
1 parent 44c9583
commit 900041f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
     "dev-api": "./scripts/build/copy-static-files.sh && (npm run --prefix shared-libs/cht-datasource build-watch & npm run --prefix api run-watch)",
     "dev-sentinel": "npm run --prefix shared-libs/cht-datasource build-watch & npm run --prefix sentinel run-watch",
     "local-images": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && node scripts/build/cli localDockerComposeFiles",
+    "set-local-version": "export VERSION=${VERSION:-$(git branch --show-current)}",
     "update-service-worker": "node scripts/build/cli updateServiceWorker",
     "-- DEV TEST SCRIPTS": "-----------------------------------------------------------------------------------------------",
     "integration-all-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && npm run ci-integration-all",
@@ -59,12 +60,12 @@
     "-- CI SCRIPTS ": "-----------------------------------------------------------------------------------------------",
     "build": "./scripts/build/build-ci.sh",
     "ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run unit-nginx && npm run unit-haproxy && npm run unit-haproxy-healthcheck && npm run unit-cht-deploy && npm run build && npm run integration-api && npm run unit",
-    "ci-integration-all": "mocha --config tests/integration/.mocharc-all.js",
-    "ci-integration-all-k3d": "mocha --config tests/integration/.mocharc-k3d.js",
-    "ci-integration-sentinel": "mocha --config tests/integration/.mocharc-sentinel.js",
-    "ci-integration-sentinel-k3d": "mocha --config tests/integration/.mocharc-sentinel-k3d.js",
-    "ci-webdriver-default": "wdio run ./tests/e2e/default/wdio.conf.js",
-    "ci-webdriver-default-mobile": "wdio run ./tests/e2e/default-mobile/wdio.conf.js",
+    "ci-integration-all": "export VERSION=${VERSION:-$(node ./scripts/build/get-version.js)} && mocha --config tests/integration/.mocharc-all.js",
+    "ci-integration-all-k3d": "export VERSION=${VERSION:-$(node ./scripts/build/get-version.js)} && mocha --config tests/integration/.mocharc-k3d.js",
+    "ci-integration-sentinel": "export VERSION=${VERSION:-$(node ./scripts/build/get-version.js)} && mocha --config tests/integration/.mocharc-sentinel.js",
+    "ci-integration-sentinel-k3d": "export VERSION=${VERSION:-$(node ./scripts/build/get-version.js)} && mocha --config tests/integration/.mocharc-sentinel-k3d.js",
+    "ci-webdriver-default": "export VERSION=${VERSION:-$(node ./scripts/build/get-version.js)} && wdio run ./tests/e2e/default/wdio.conf.js",
+    "ci-webdriver-default-mobile": "export VERSION=${VERSION:-$(node ./scripts/build/get-version.js)} wdio run ./tests/e2e/default-mobile/wdio.conf.js",
     "publish-for-testing": "./scripts/build/build-service-images.sh && mkdir -p images && node scripts/build/cli publishServiceImages && node ./scripts/build/ddoc-compile.js staging && node ./scripts/build/push-ddoc-to-staging.js",
     "test-config-default": "cd config/default && npm run test",
     "upgrade-wdio": "wdio run ./tests/e2e/upgrade/wdio.conf.js"

diff --git a/scripts/build/versions.js b/scripts/build/versions.js
@@ -1,5 +1,6 @@
 const packageJson = require('../../package.json');
 const buildTime = new Date().getTime();
+const { execSync } = require('child_process');
 
 const {
   ECR_REPO,
@@ -46,7 +47,7 @@ const getVersion = (release) => {
     return process.env.VERSION;
   }
 
-  return `${packageJson.version}-dev.${buildTime}`;
+  return execSync('git branch --show-current', { encoding: 'utf-8' }).trim();
 };
 
 const getImageTag = (service, release = false) => {