Merge pull request #5590 from gooddata/IMJ-STL-952

chore: fix __version.ts generation and add build-generate-version
gooddata · Nov 25, 2024 · c959a87 · c959a87
2 parents 5e6569a + 3471cd3
commit c959a87
Show file tree

Hide file tree

Showing 17 changed files with 60 additions and 16 deletions.
diff --git a/.github/actions/rush/set-up-rush/action.yml b/.github/actions/rush/set-up-rush/action.yml
@@ -32,7 +32,7 @@ runs:
       shell: bash
 
     - name: Enable rush build cache via environment variable
-      run: echo "RUSH_BUILD_CACHE_ENABLED=0" >> $GITHUB_ENV
+      run: echo "RUSH_BUILD_CACHE_ENABLED=1" >> $GITHUB_ENV
       shell: bash
 
     # Restore cache for global rush installation

diff --git a/.github/workflows/rw-rush-build-basic-checks.yml b/.github/workflows/rw-rush-build-basic-checks.yml
@@ -73,6 +73,8 @@ jobs:
         run: |
           # build libs first, then the app
           node common/scripts/install-run-rush.js build
+      - name: Rush generate dynamic files related to build
+        run: node common/scripts/install-run-rush.js build-generate-version
       - name: Rush validate
         run: |
           # build libs first, then the app
@@ -101,6 +103,8 @@ jobs:
         run: |
           # build libs first, then the app
           node common/scripts/install-run-rush.js build
+      - name:  Rush generate dynamic files related to build
+        run: node common/scripts/install-run-rush.js build-generate-version
       - name: Rush test-ci
         run: |
           node common/scripts/install-run-rush.js test-ci
diff --git a/common/config/rush/command-line.json b/common/config/rush/command-line.json
@@ -120,6 +120,14 @@
       "enableParallelism": true,
       "allowWarningsInSuccessfulBuild": false
     },
+    {
+      "commandKind": "bulk",
+      "name": "build-generate-version",
+      "summary": "This command will generate dynamic __version.ts files after build is restored from cache, because this files are generated only during build and are not stored in cache.",
+      "enableParallelism": true,
+      "allowWarningsInSuccessfulBuild": true,
+      "ignoreMissingScript": true
+    },
     {
       "commandKind": "global",
       "name": "audit",

diff --git a/libs/api-client-tiger/package.json b/libs/api-client-tiger/package.json
@@ -23,6 +23,7 @@
     "scripts": {
         "clean": "rm -rf ci dist esm coverage *.log tsconfig.tsbuildinfo",
         "build": "bash scripts/build.sh",
+        "build-generate-version": "bash scripts/build.sh --genVersionOnly",
         "openapi-generate": "./scripts/generate.js",
         "generate-client": "rm -rf src/generated/* && npm run openapi-generate && fix-esm-import-path ./src && npm run prettier-write",
         "api-extractor": "mkdir -p api && [ -z \"${CI}\" ] && (api-extractor run -l) || (api-extractor run)",

diff --git a/libs/api-client-tiger/scripts/build.sh b/libs/api-client-tiger/scripts/build.sh
@@ -14,8 +14,11 @@ _common-build() {
 
 build() {
     _common-build
-    tsc -p tsconfig.json
-    npm run api-extractor
+
+    if [[ $1 != "--genVersionOnly" ]]; then
+        tsc -p tsconfig.json
+        npm run api-extractor
+    fi
 }
 
-build
+build $1
diff --git a/libs/sdk-backend-tiger/package.json b/libs/sdk-backend-tiger/package.json
@@ -24,6 +24,7 @@
         "clean": "rm -rf ci dist esm coverage *.log tsconfig.tsbuildinfo",
         "clear-recordings": "rm -rf ./tests/wiremock/recordings/*",
         "build": "bash scripts/build.sh",
+        "build-generate-version": "bash scripts/build.sh --genVersionOnly",
         "api-extractor": "mkdir -p api && [ -z \"${CI}\" ] && (api-extractor run -l) || (api-extractor run)",
         "integrated-test": "./scripts/integrated-test.sh",
         "integrated-test-live-backend": "./scripts/integrated-test-live-backend.sh",

diff --git a/libs/sdk-backend-tiger/scripts/build.sh b/libs/sdk-backend-tiger/scripts/build.sh
@@ -14,8 +14,11 @@ _common-build() {
 
 build() {
     _common-build
-    tsc -p tsconfig.json
-    npm run api-extractor
+
+    if [[ $1 != "--genVersionOnly" ]]; then
+        tsc -p tsconfig.json
+        npm run api-extractor
+    fi
 }
 
-build
+build $1
diff --git a/libs/sdk-ui-dashboard/package.json b/libs/sdk-ui-dashboard/package.json
@@ -36,6 +36,7 @@
         "clean": "rm -rf ci dist esm coverage *.log styles/css tsconfig.tsbuildinfo",
         "api-extractor": "mkdir -p api && [ -z \"${CI}\" ] && (api-extractor run -l; exit 0) || (api-extractor run)",
         "build": "bash scripts/build.sh",
+        "build-generate-version": "bash scripts/build.sh --genVersionOnly",
         "prepack": "cp -f ../../NOTICE ./NOTICE",
         "prepublishOnly": "npm run build",
         "test": "vitest --watch",

diff --git a/libs/sdk-ui-dashboard/scripts/build.sh b/libs/sdk-ui-dashboard/scripts/build.sh
@@ -20,18 +20,23 @@ _assets() {
     svgo -rqf src/assets esm/assets
 }
 
-_common-build() {
+styles-build() {
     _assets
-
     _build_styles
+}
 
+_common-build() {
     _version
 }
 
 build() {
     _common-build
-    tsc -p tsconfig.json
-    npm run api-extractor
+
+    if [[ $1 != "--genVersionOnly" ]]; then
+        styles-build
+        tsc -p tsconfig.json
+        npm run api-extractor
+    fi
 }
 
-build
+build $1
diff --git a/tools/app-toolkit/package.json b/tools/app-toolkit/package.json
@@ -28,6 +28,7 @@
         "clean": "rm -rf ci dist esm build coverage *.log tsconfig.tsbuildinfo",
         "prepublishOnly": "npm run build",
         "build": "bash scripts/build.sh",
+        "build-generate-version": "bash scripts/build.sh --genVersionOnly",
         "prepack": "cp -f ../../NOTICE ./NOTICE",
         "test": "vitest watch --passWithNoTests",
         "test-once": "vitest run --passWithNoTests",

diff --git a/tools/app-toolkit/scripts/build.sh b/tools/app-toolkit/scripts/build.sh
@@ -6,6 +6,11 @@ echo '// (C) 2021 GoodData Corporation' >src/__version.ts
 echo '// DO NOT CHANGE THIS FILE, IT IS RE-GENERATED ON EVERY BUILD' >>src/__version.ts
 node -p "'export const LIB_VERSION = ' + JSON.stringify(require('./package.json').version) + ';' +'\n\n' + 'export const LIB_DESCRIPTION =' + '\n    ' + JSON.stringify(require('./package.json').description) + ';' +'\n\n' + 'export const LIB_NAME = ' + JSON.stringify(require('./package.json').name) + ';'" >>src/__version.ts
 
+if [[ $1 == "--genVersionOnly" ]]; then
+  #we need just version file and it is generated, so we can exit
+  exit 0
+fi;
+
 set -e
 
 PACKAGE_DIR="$(echo $(cd $(dirname $0)/.. && pwd -P))"

diff --git a/tools/catalog-export/package.json b/tools/catalog-export/package.json
@@ -24,6 +24,7 @@
     "scripts": {
         "clean": "rm -rf ci dist esm coverage *.log tsconfig.tsbuildinfo",
         "build": "bash scripts/build.sh",
+        "build-generate-version": "bash scripts/build.sh --genVersionOnly",
         "test": "vitest watch",
         "test-once": "vitest run",
         "test-ci": "vitest run --reporter=junit --outputFile=./ci/results/test-results.xml",

diff --git a/tools/catalog-export/scripts/build.sh b/tools/catalog-export/scripts/build.sh
@@ -15,7 +15,9 @@ _common-build() {
 build() {
     _common-build
 
-    tsc -p tsconfig.json
+    if [[ $1 != "--genVersionOnly" ]]; then
+        tsc -p tsconfig.json
+    fi
 }
 
-build
+build $1
diff --git a/tools/mock-handling/package.json b/tools/mock-handling/package.json
@@ -24,6 +24,7 @@
     "scripts": {
         "clean": "rm -rf ci dist esm coverage *.log tsconfig.tsbuildinfo",
         "build": "bash scripts/build.sh",
+        "build-generate-version": "bash scripts/build.sh --genVersionOnly",
         "test": "vitest watch",
         "test-once": "vitest run",
         "test-ci": "vitest run --reporter=junit --outputFile=./ci/results/test-results.xml",

diff --git a/tools/mock-handling/scripts/build.sh b/tools/mock-handling/scripts/build.sh
@@ -15,7 +15,9 @@ _common-build() {
 build() {
     _common-build
 
-    tsc -p tsconfig.json
+    if [[ $1 != "--genVersionOnly" ]]; then
+        tsc -p tsconfig.json
+    fi
 }
 
-build
+build $1
diff --git a/tools/plugin-toolkit/package.json b/tools/plugin-toolkit/package.json
@@ -29,6 +29,7 @@
         "clean": "rm -rf ci dist esm build coverage *.log tsconfig.tsbuildinfo",
         "prepublishOnly": "npm run build",
         "build": "bash scripts/build.sh",
+        "build-generate-version": "bash scripts/build.sh --genVersionOnly",
         "prepack": "cp -f ../../NOTICE ./NOTICE",
         "test": "vitest watch",
         "test-once": "vitest run",

diff --git a/tools/plugin-toolkit/scripts/build.sh b/tools/plugin-toolkit/scripts/build.sh
@@ -6,6 +6,11 @@ echo '// (C) 2021 GoodData Corporation' >src/__version.ts
 echo '// DO NOT CHANGE THIS FILE, IT IS RE-GENERATED ON EVERY BUILD' >>src/__version.ts
 node -p "'export const LIB_VERSION = ' + JSON.stringify(require('./package.json').version) + ';' +'\n\n' + 'export const LIB_DESCRIPTION = ' + JSON.stringify(require('./package.json').description) + ';' +'\n\n' + 'export const LIB_NAME = ' + JSON.stringify(require('./package.json').name) + ';'" >>src/__version.ts
 
+if [[ $1 == "--genVersionOnly" ]]; then
+  #we need just version file and it is generated, so we can exit
+  exit 0
+fi;
+
 set -e
 
 PACKAGE_DIR="$(echo $(cd $(dirname $0)/.. && pwd -P))"