Add runner.os to all cache keys

Signed-off-by: Timo Stamm <ts@timostamm.de>
connectrpc · Aug 29, 2024 · c3614ad · c3614ad
1 parent 013b92d
commit c3614ad
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/browserstack.yaml b/.github/workflows/browserstack.yaml
@@ -28,8 +28,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/browserstack/${{ github.sha }}
-          restore-keys: connect-es/browserstack
+          key: ${{ runner.os }}/browserstack/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/browserstack
       - name: NPM Install
         run: npm ci
       - name: Browserstack

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -26,8 +26,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/format/${{ github.sha }}
-          restore-keys: connect-es/format
+          key: ${{ runner.os }}/format/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/format
       - name: NPM Install
         run: npm ci
       - name: Format
@@ -44,8 +44,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/license-header/${{ github.sha }}
-          restore-keys: connect-es/license-header
+          key: ${{ runner.os }}/license-header/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/license-header
       - name: NPM Install
         run: npm ci
       - name: Update license headers
@@ -62,8 +62,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/lint/${{ github.sha }}
-          restore-keys: connect-es/lint
+          key: ${{ runner.os }}/lint/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/lint
       - name: NPM Install
         run: npm ci
       - name: lint
@@ -78,8 +78,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/attw/${{ github.sha }}
-          restore-keys: connect-es/attw
+          key: ${{ runner.os }}/attw/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/attw
       - name: NPM Install
         run: npm ci
       - name: Are the types wrong
@@ -94,8 +94,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/bundle-size/${{ github.sha }}
-          restore-keys: connect-es/bundle-size
+          key: ${{ runner.os }}/bundle-size/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/bundle-size
       - name: NPM Install
         run: npm ci
       - name: Bundle size
@@ -112,8 +112,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/build/${{ github.sha }}
-          restore-keys: connect-es/build
+          key: ${{ runner.os }}/build/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/build
       - name: NPM Install
         run: npm ci
       - name: build
@@ -136,8 +136,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/test/${{ github.sha }}
-          restore-keys: connect-es/test
+          key: ${{ runner.os }}/test/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/test
       - name: NPM Install
         run: npm ci
       - name: Run
@@ -157,8 +157,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/test/${{ github.sha }}
-          restore-keys: connect-es/test
+          key: ${{ runner.os }}/test/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/test
       - name: NPM Install
         run: npm ci
       - name: "Run, excluding @connectrpc/connect-web"

diff --git a/.github/workflows/conformance-cloudflare.yaml b/.github/workflows/conformance-cloudflare.yaml
@@ -27,8 +27,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/cloudflare-conformance/${{ github.sha }}
-          restore-keys: connect-es/cloudflare-conformance
+          key: ${{ runner.os }}/cloudflare-conformance/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/cloudflare-conformance
       - name: NPM Install
         run: npm ci
       - name: conformance:server

diff --git a/.github/workflows/conformance-express.yaml b/.github/workflows/conformance-express.yaml
@@ -32,8 +32,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/express-conformance/${{ github.sha }}
-          restore-keys: connect-es/express-conformance
+          key: ${{ runner.os }}/express-conformance/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/express-conformance
       - name: NPM Install
         run: npm ci
       - name: Run

diff --git a/.github/workflows/conformance-fastify.yaml b/.github/workflows/conformance-fastify.yaml
@@ -32,8 +32,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/fastify-conformance/${{ github.sha }}
-          restore-keys: connect-es/fastify-conformance
+          key: ${{ runner.os }}/fastify-conformance/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/fastify-conformance
       - name: NPM Install
         run: npm ci
       - name: Run

diff --git a/.github/workflows/conformance-node.yaml b/.github/workflows/conformance-node.yaml
@@ -33,8 +33,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/node-conformance/${{ github.sha }}
-          restore-keys: connect-es/node-conformance
+          key: ${{ runner.os }}/node-conformance/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/node-conformance
       - name: NPM Install
         run: npm ci
       - name: Run

diff --git a/.github/workflows/conformance-web.yaml b/.github/workflows/conformance-web.yaml
@@ -37,8 +37,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/web-conformance/${{ github.sha }}
-          restore-keys: connect-es/web-conformance
+          key: ${{ runner.os }}/web-conformance/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/web-conformance
       - name: NPM Install
         run: npm ci
       - name: Run
@@ -60,8 +60,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: .turbo
-          key: connect-es/web-conformance/${{ github.sha }}
-          restore-keys: connect-es/web-conformance
+          key: ${{ runner.os }}/web-conformance/${{ github.sha }}
+          restore-keys: ${{ runner.os }}/web-conformance
       - name: NPM Install
         run: npm ci
       - name: Run