elastic
diff --git a/‎src/dev/ci_setup/setup.sh‎
Lines changed: 4 additions & 0 deletions b/‎src/dev/ci_setup/setup.sh‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/dev/typescript/build_ts_refs_cli.ts‎
Lines changed: 4 additions & 1 deletion b/‎src/dev/typescript/build_ts_refs_cli.ts‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/dev/typescript/ref_output_cache/ref_output_cache.ts‎
Lines changed: 1 addition & 1 deletion b/‎src/dev/typescript/ref_output_cache/ref_output_cache.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎x-pack/plugins/apm/public/context/url_params_context/url_params_context.tsx‎
Lines changed: 1 addition & 1 deletion b/‎x-pack/plugins/apm/public/context/url_params_context/url_params_context.tsx‎
Lines changed: 1 addition & 1 deletion
@@ -21,6 +21,10 @@ cp "src/dev/ci_setup/.bazelrc-ci" "$HOME/.bazelrc";
 echo "# Appended by src/dev/ci_setup/setup.sh" >> "$HOME/.bazelrc"
 echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$HOME/.bazelrc"
 
+if [[ "$BUILD_TS_REFS_CACHE_ENABLE" != "true" ]]; then
+  export BUILD_TS_REFS_CACHE_ENABLE=false
+fi
+
 ###
 ### install dependencies
 ###
 
@@ -23,7 +23,7 @@ export async function runBuildRefsCli() {
     async ({ log, flags }) => {
       const outDirs = getOutputsDeep(REF_CONFIG_PATHS);
 
-      const cacheEnabled = process.env.BUILD_TS_REFS_CACHE_ENABLE === 'true' || !!flags.cache;
+      const cacheEnabled = process.env.BUILD_TS_REFS_CACHE_ENABLE !== 'false' && !!flags.cache;
       const doCapture = process.env.BUILD_TS_REFS_CACHE_CAPTURE === 'true';
       const doClean = !!flags.clean || doCapture;
       const doInitCache = cacheEnabled && !doClean;
@@ -62,6 +62,9 @@ export async function runBuildRefsCli() {
       description: 'Build TypeScript projects',
       flags: {
         boolean: ['clean', 'cache'],
+        default: {
+          cache: true,
+        },
       },
       log: {
         defaultLevel: 'debug',
 
@@ -132,7 +132,7 @@ export class RefOutputCache {
       this.log.debug(`[${relative}] clearing outDir and replacing with cache`);
       await del(outDir);
       await unzip(Path.resolve(tmpDir, cacheName), outDir);
-      await Fs.writeFile(Path.resolve(outDir, OUTDIR_MERGE_BASE_FILENAME), archive.sha);
+      await Fs.writeFile(Path.resolve(outDir, OUTDIR_MERGE_BASE_FILENAME), this.mergeBase);
     });
   }
 
 
@@ -37,7 +37,7 @@ function useUiFilters(params: IUrlParams): UIFilters {
   ) as Partial<Record<LocalUIFilterName, string[]>>;
 
   return useDeepObjectIdentity({
-    kuery,
+    environment: params.environment,
     ...localUiFilters,
   });
 }
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ export class RefOutputCache {`
`132`	`132`	this.log.debug(`[${relative}] clearing outDir and replacing with cache`);
`133`	`133`	`await del(outDir);`
`134`	`134`	`await unzip(Path.resolve(tmpDir, cacheName), outDir);`
`135`		`- await Fs.writeFile(Path.resolve(outDir, OUTDIR_MERGE_BASE_FILENAME), archive.sha);`
	`135`	`+ await Fs.writeFile(Path.resolve(outDir, OUTDIR_MERGE_BASE_FILENAME), this.mergeBase);`
`136`	`136`	`});`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ function useUiFilters(params: IUrlParams): UIFilters {`
`37`	`37`	`) as Partial<Record<LocalUIFilterName, string[]>>;`
`38`	`38`
`39`	`39`	`return useDeepObjectIdentity({`
`40`		`- kuery,`
	`40`	`+ environment: params.environment,`
`41`	`41`	`...localUiFilters,`
`42`	`42`	`});`
`43`	`43`	`}`