Merge pull request #100 from crazy-max/explicit-semver

Explicit version spec for caching
docker · Jul 12, 2021 · abe5d8f · abe5d8f
2 parents e673438 + 580d5c7
commit abe5d8f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -323,6 +323,7 @@ jobs:
           - master
           - refs/tags/v0.5.1
           - refs/pull/648/head
+          - 67bd6f4dc82a9cd96f34133dab3f6f7af803bb14
     steps:
       -
         name: Checkout

diff --git a/__tests__/buildx.test.ts b/__tests__/buildx.test.ts
@@ -93,12 +93,17 @@ describe('inspect', () => {
 });
 
 describe('build', () => {
-  it.skip('valid', async () => {
-    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'setup-buildx-'));
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'setup-buildx-'));
+  it.skip('builds refs/pull/648/head', async () => {
     const buildxBin = await buildx.build('https://github.com/docker/buildx.git#refs/pull/648/head', tmpDir);
     console.log(buildxBin);
     expect(fs.existsSync(buildxBin)).toBe(true);
   }, 100000);
+  it.skip('builds 67bd6f4dc82a9cd96f34133dab3f6f7af803bb14', async () => {
+    const buildxBin = await buildx.build('https://github.com/docker/buildx.git#67bd6f4dc82a9cd96f34133dab3f6f7af803bb14', tmpDir);
+    console.log(buildxBin);
+    expect(fs.existsSync(buildxBin)).toBe(true);
+  }, 100000);
 });
 
 describe('install', () => {

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/buildx.ts b/src/buildx.ts
@@ -117,11 +117,16 @@ export async function build(inputBuildRef: string, dockerConfigHome: string): Pr
     ref = 'master';
   }
 
-  const sha = await git.getRemoteSha(repo, ref);
-  core.debug(`Remote ref ${sha} found`);
+  let vspec: string;
+  if (ref.match(/^[0-9a-fA-F]{40}$/)) {
+    vspec = ref;
+  } else {
+    vspec = await git.getRemoteSha(repo, ref);
+  }
+  core.debug(`Tool version spec ${vspec}`);
 
   let toolPath: string;
-  toolPath = tc.find('buildx', sha);
+  toolPath = tc.find('buildx', vspec);
   if (!toolPath) {
     const outFolder = path.join(context.tmpDir(), 'out').split(path.sep).join(path.posix.sep);
     toolPath = await exec
@@ -132,7 +137,7 @@ export async function build(inputBuildRef: string, dockerConfigHome: string): Pr
         if (res.stderr.length > 0 && res.exitCode != 0) {
           core.warning(res.stderr.trim());
         }
-        return tc.cacheFile(`${outFolder}/buildx`, context.osPlat == 'win32' ? 'docker-buildx.exe' : 'docker-buildx', 'buildx', sha);
+        return tc.cacheFile(`${outFolder}/buildx`, context.osPlat == 'win32' ? 'docker-buildx.exe' : 'docker-buildx', 'buildx', vspec);
       });
   }