Merge pull request #216 from docker/bot/docker-releases-json

Update `.github/docker-releases.json`
github: update .github/docker-releases.json
2023-12-03 15:38:34 -08:00 · 2023-12-03 23:38:24 +00:00 · 2023-12-03 15:37:54 -08:00 · 2023-12-03 21:15:38 +01:00 · 2023-12-01 03:20:11 -08:00 · 2023-12-01 11:19:42 +00:00
4 changed files with 103 additions and 3 deletions
--- a/.github/buildx-lab-releases.json
+++ b/.github/buildx-lab-releases.json
@@ -40,6 +40,47 @@
      "https://github.com/docker/buildx-desktop/releases/download/v0.11.2-desktop.5/checksums.txt"
    ]
  },
+  "v0.12.0-desktop.2": {
+    "id": 132264953,
+    "tag_name": "v0.12.0-desktop.2",
+    "html_url": "https://github.com/docker/buildx-desktop/releases/tag/v0.12.0-desktop.2",
+    "assets": [
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.darwin-amd64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.darwin-amd64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.darwin-amd64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.darwin-arm64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.darwin-arm64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.darwin-arm64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-amd64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-amd64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-amd64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-arm-v6",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-arm-v6.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-arm-v6.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-arm-v7",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-arm-v7.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-arm-v7.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-arm64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-arm64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-arm64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-ppc64le",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-ppc64le.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-ppc64le.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-riscv64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-riscv64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-riscv64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-s390x",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-s390x.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.linux-s390x.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.windows-amd64.exe",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.windows-amd64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.windows-amd64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.windows-arm64.exe",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.windows-arm64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/buildx-v0.12.0-desktop.2.windows-arm64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.12.0-desktop.2/checksums.txt"
+    ]
+  },
  "v0.12.0-desktop.1": {
    "id": 130699107,
    "tag_name": "v0.12.0-desktop.1",
--- a/.github/docker-releases.json
+++ b/.github/docker-releases.json
@@ -5,6 +5,18 @@
    "html_url": "https://github.com/moby/moby/releases/tag/v24.0.7",
    "assets": []
  },
+  "v23.0.8": {
+    "id": 132317923,
+    "tag_name": "v23.0.8",
+    "html_url": "https://github.com/moby/moby/releases/tag/v23.0.8",
+    "assets": []
+  },
+  "v20.10.27": {
+    "id": 132318746,
+    "tag_name": "v20.10.27",
+    "html_url": "https://github.com/moby/moby/releases/tag/v20.10.27",
+    "assets": []
+  },
  "v25.0.0-beta.1": {
    "id": 129244747,
    "tag_name": "v25.0.0-beta.1",
--- a/tests/git.test.ts
+++ b/tests/git.test.ts
@@ -141,6 +141,52 @@ describe('ref', () => {
    expect(ref).toEqual('refs/tags/8.0.0');
  });

+  it('returns mocked detached tag ref (shallow clone)', async () => {
+    jest.spyOn(Exec, 'getExecOutput').mockImplementation((cmd, args): Promise<ExecOutput> => {
+      const fullCmd = `${cmd} ${args?.join(' ')}`;
+      let result = '';
+      switch (fullCmd) {
+        case 'git branch --show-current':
+          result = '';
+          break;
+        case 'git show -s --pretty=%D':
+          result = 'grafted, HEAD, tag: 8.0.0';
+          break;
+      }
+      return Promise.resolve({
+        stdout: result,
+        stderr: '',
+        exitCode: 0
+      });
+    });
+
+    const ref = await Git.ref();
+
+    expect(ref).toEqual('refs/tags/8.0.0');
+  });
+
+  it('should throws an error when detached HEAD ref is not supported', async () => {
+    jest.spyOn(Exec, 'getExecOutput').mockImplementation((cmd, args): Promise<ExecOutput> => {
+      const fullCmd = `${cmd} ${args?.join(' ')}`;
+      let result = '';
+      switch (fullCmd) {
+        case 'git branch --show-current':
+          result = '';
+          break;
+        case 'git show -s --pretty=%D':
+          result = 'wrong, HEAD, tag: 8.0.0';
+          break;
+      }
+      return Promise.resolve({
+        stdout: result,
+        stderr: '',
+        exitCode: 0
+      });
+    });
+
+    await expect(Git.ref()).rejects.toThrow('Cannot find detached HEAD ref in "wrong, HEAD, tag: 8.0.0"');
+  });
+
  it('returns mocked detached branch ref', async () => {
    jest.spyOn(Exec, 'getExecOutput').mockImplementation((cmd, args): Promise<ExecOutput> => {
      const fullCmd = `${cmd} ${args?.join(' ')}`;
--- a/src/git.ts
+++ b/src/git.ts
@@ -123,13 +123,14 @@ export class Git {
  private static async getDetachedRef(): Promise<string> {
    const res = await Git.exec(['show', '-s', '--pretty=%D']);

-    const refMatch = res.match(/^HEAD, (.*)$/);
+    // Can be "HEAD, <tagname>" or "grafted, HEAD, <tagname>"
+    const refMatch = res.match(/^(grafted, )?HEAD, (.*)$/);

-    if (!refMatch) {
+    if (!refMatch || !refMatch[2]) {
      throw new Error(`Cannot find detached HEAD ref in "${res}"`);
    }

-    const ref = refMatch[1].trim();
+    const ref = refMatch[2].trim();

    // Tag refs are formatted as "tag: <tagname>"
    if (ref.startsWith('tag: ')) {
Author	SHA1	Message	Date
CrazyMax	1de2911b5e	Merge pull request #216 from docker/bot/docker-releases-json Some checks failed publish / publish (push) Has been cancelled Details Update `.github/docker-releases.json`	2023-12-03 15:38:34 -08:00
crazy-max	9e9fc490d2	github: update .github/docker-releases.json Signed-off-by: GitHub <noreply@github.com>	2023-12-03 23:38:24 +00:00
CrazyMax	a45afd3161	Merge pull request #217 from hoverkraft-tech/fix/handle-detached-ref-shallow-clone fix(git): handle detached ref in shallow clone context	2023-12-03 15:37:54 -08:00
Emilien Escalle	7d829c430b	fix(git): handle detached ref in shallow clone context Signed-off-by: Emilien Escalle <emilien.escalle@escemi.com>	2023-12-03 21:15:38 +01:00
CrazyMax	ddc04994d9	Merge pull request #215 from docker/bot/buildx-lab-releases-json Update `.github/buildx-lab-releases.json`	2023-12-01 03:20:11 -08:00
crazy-max	b613f395b8	github: update .github/buildx-lab-releases.json Signed-off-by: GitHub <noreply@github.com>	2023-12-01 11:19:42 +00:00