Merge 6f561038c8 into 93397bea11

.github/workflows/windows-validation.yml

@@ -105,32 +105,10 @@ jobs:
           fi
         shell: bash
 
-      - name: 'Drive D: should not have Go installation, cache: ${{ matrix.cache }}'
+      - name: 'Drive D: should not have Go installation, cache: ${{ matrix.cache}}'
         run: |
           if [ -e 'D:\hostedtoolcache\windows\go\${{ needs.find-default-go.outputs.version }}\x64' ];then
             echo 'D:\hostedtoolcache\windows\go\${{ needs.find-default-go.outputs.version }}\x64 should not exist for hosted version of go';
             exit 1
           fi
         shell: bash
-
-  hostedtoolcache:
-    name: 'Validate if hostedtoolcache works as expected'
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        cache: [false]
-        go: [1.20.1]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: 'Setup ${{ matrix.go }}, cache: ${{ matrix.cache }}'
-        uses: ./
-        with:
-          go-version: ${{ matrix.go }}
-          cache: ${{ matrix.cache }}
-
-      - name: 'Setup ${{ matrix.go }}, cache: ${{ matrix.cache }} (from hostedtoolcache)'
-        uses: ./
-        with:
-          go-version: ${{ matrix.go }}
-          cache: ${{ matrix.cache }}

dist/setup/index.js

@@ -61514,10 +61514,6 @@ function cacheWindowsDir(extPath, tool, version, arch) {
         fs_1.default.mkdirSync(path.dirname(defaultToolCacheDir), { recursive: true });
         fs_1.default.symlinkSync(actualToolCacheDir, defaultToolCacheDir, 'junction');
         core.info(`Created link ${defaultToolCacheDir} => ${actualToolCacheDir}`);
-        const actualToolCacheCompleteFile = `${actualToolCacheDir}.complete`;
-        const defaultToolCacheCompleteFile = `${defaultToolCacheDir}.complete`;
-        fs_1.default.symlinkSync(actualToolCacheCompleteFile, defaultToolCacheCompleteFile, 'file');
-        core.info(`Created link ${defaultToolCacheCompleteFile} => ${actualToolCacheCompleteFile}`);
         // make outer code to continue using toolcache as if it were installed on c:
         // restore toolcache root to default drive c:
         process.env['RUNNER_TOOL_CACHE'] = defaultToolCacheRoot;

src/installer.ts

@@ -203,17 +203,6 @@ async function cacheWindowsDir(
   fs.symlinkSync(actualToolCacheDir, defaultToolCacheDir, 'junction');
   core.info(`Created link ${defaultToolCacheDir} => ${actualToolCacheDir}`);
 
-  const actualToolCacheCompleteFile = `${actualToolCacheDir}.complete`;
-  const defaultToolCacheCompleteFile = `${defaultToolCacheDir}.complete`;
-  fs.symlinkSync(
-    actualToolCacheCompleteFile,
-    defaultToolCacheCompleteFile,
-    'file'
-  );
-  core.info(
-    `Created link ${defaultToolCacheCompleteFile} => ${actualToolCacheCompleteFile}`
-  );
-
   // make outer code to continue using toolcache as if it were installed on c:
   // restore toolcache root to default drive c:
   process.env['RUNNER_TOOL_CACHE'] = defaultToolCacheRoot;