log to posix

bazel-contrib · May 31, 2024 · a36fde6 · a36fde6
1 parent d683b61
commit a36fde6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,10 +19,14 @@ jobs:
           - ubuntu
           - windows
     steps:
+      - run: rm $(which bazel)
       - uses: actions/checkout@v4
       - uses: ./
         with:
+          bazelisk-cache: true
+          bazelisk-version: 1.x
           remote-cache: true
+          repository-cache: true
       - uses: actions/checkout@v4
         with:
           repository: bazelbuild/examples

diff --git a/config.js b/config.js
@@ -46,10 +46,11 @@ if (diskCacheEnabled) {
   }
 }
 
+const remoteCacheLogPath = core.toPosixPath(`${os.tmpdir()}/remote-cache-server.log`)
 const remoteCacheServerUrl = 'http://localhost:9889/cache'
 const remoteCacheEnabled = core.getBooleanInput('remote-cache')
 if (remoteCacheEnabled) {
-  bazelrc.push(`build --remote_cache=${remoteCacheServerUrl}\n`)
+  bazelrc.push(`build --remote_cache=${remoteCacheServerUrl}`)
   if (diskCacheEnabled) {
     core.error('Disk cache and remote cache cannot be enabled at the same time')
   }
@@ -162,7 +163,7 @@ module.exports = {
   },
   remoteCache: {
     enabled: remoteCacheEnabled,
-    logPath: `${os.tmpdir()}/remote-cache-server.log`,
+    logPath: remoteCacheLogPath,
     url: remoteCacheServerUrl,
   }
 }
diff --git a/dist/main/index.js b/dist/main/index.js
@@ -52,10 +52,11 @@ if (diskCacheEnabled) {
   }
 }
 
+const remoteCacheLogPath = core.toPosixPath(`${os.tmpdir()}/remote-cache-server.log`)
 const remoteCacheServerUrl = 'http://localhost:9889/cache'
 const remoteCacheEnabled = core.getBooleanInput('remote-cache')
 if (remoteCacheEnabled) {
-  bazelrc.push(`build --remote_cache=${remoteCacheServerUrl}\n`)
+  bazelrc.push(`build --remote_cache=${remoteCacheServerUrl}`)
   if (diskCacheEnabled) {
     core.error('Disk cache and remote cache cannot be enabled at the same time')
   }
@@ -168,7 +169,7 @@ module.exports = {
   },
   remoteCache: {
     enabled: remoteCacheEnabled,
-    logPath: `${os.tmpdir()}/remote-cache-server.log`,
+    logPath: remoteCacheLogPath,
     url: remoteCacheServerUrl,
   }
 }

diff --git a/dist/main/index.js.map b/dist/main/index.js.map
diff --git a/dist/post/index.js b/dist/post/index.js
@@ -52,10 +52,11 @@ if (diskCacheEnabled) {
   }
 }
 
+const remoteCacheLogPath = core.toPosixPath(`${os.tmpdir()}/remote-cache-server.log`)
 const remoteCacheServerUrl = 'http://localhost:9889/cache'
 const remoteCacheEnabled = core.getBooleanInput('remote-cache')
 if (remoteCacheEnabled) {
-  bazelrc.push(`build --remote_cache=${remoteCacheServerUrl}\n`)
+  bazelrc.push(`build --remote_cache=${remoteCacheServerUrl}`)
   if (diskCacheEnabled) {
     core.error('Disk cache and remote cache cannot be enabled at the same time')
   }
@@ -168,7 +169,7 @@ module.exports = {
   },
   remoteCache: {
     enabled: remoteCacheEnabled,
-    logPath: `${os.tmpdir()}/remote-cache-server.log`,
+    logPath: remoteCacheLogPath,
     url: remoteCacheServerUrl,
   }
 }

diff --git a/dist/post/index.js.map b/dist/post/index.js.map