From 90bc9ea6ad80d5318adcde5b5db2725dfbbf99d6 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 1 Dec 2025 08:02:27 +0000
Subject: [PATCH] Revert "Engineering - don't use hashFiles on macOS (#279015)"
 (#279993)

This reverts commit be127fdd321f9b25d1faf56e562465813548d2a1.
---
 .github/workflows/pr-darwin-test.yml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/pr-darwin-test.yml b/.github/workflows/pr-darwin-test.yml
index dd8f9d909d4..01c3eb070d7 100644
--- a/.github/workflows/pr-darwin-test.yml
+++ b/.github/workflows/pr-darwin-test.yml
@@ -32,19 +32,14 @@ jobs:
           node-version-file: .nvmrc
 
       - name: Prepare node_modules cache key
-        id: prepare-node-modules-cache-key
-        run: |
-          set -e
-          mkdir -p .build
-          node build/azure-pipelines/common/computeNodeModulesCacheKey.ts darwin $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
-          echo "node_modules_cache_key=$(cat .build/packagelockhash)" >> $GITHUB_OUTPUT
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts darwin $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
         id: cache-node-modules
         uses: actions/cache/restore@v4
         with:
           path: .build/node_modules_cache
-          key: "node_modules-macos-${{ steps.prepare-node-modules-cache-key.outputs.node_modules_cache_key }}"
+          key: "node_modules-macos-${{ hashFiles('.build/packagelockhash') }}"
 
       - name: Extract node_modules cache
         if: steps.cache-node-modules.outputs.cache-hit == 'true'
@@ -90,12 +85,7 @@ jobs:
         run: mkdir -p .build
 
       - name: Prepare built-in extensions cache key
-        id: prepare-builtin-extensions-cache-key
-        run: |
-          set -e
-          mkdir -p .build
-          node build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts > .build/builtindepshash
-          echo "builtin_extensions_cache_key=$(cat .build/builtindepshash)" >> $GITHUB_OUTPUT
+        run: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts > .build/builtindepshash
 
       - name: Restore built-in extensions cache
         id: cache-builtin-extensions
@@ -103,7 +93,7 @@ jobs:
         with:
           enableCrossOsArchive: true
           path: .build/builtInExtensions
-          key: "builtin-extensions-${{ steps.prepare-builtin-extensions-cache-key.outputs.builtin_extensions_cache_key }}"
+          key: "builtin-extensions-${{ hashFiles('.build/builtindepshash') }}"
 
       - name: Download built-in extensions
         if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'