diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5fab78cc..1778261b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - windows-latest version: - latest - - '~> 0.166' + - '~> 0.182' distribution: - goreleaser - goreleaser-pro diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts index aa25dcdb..7d1e1e88 100644 --- a/__tests__/git.test.ts +++ b/__tests__/git.test.ts @@ -8,10 +8,10 @@ describe('git', () => { expect(tag).not.toEqual(''); }); it('returns git tag through GITHUB_SHA', async () => { - process.env.GITHUB_SHA = '6e37040623d14330555c7be1603a9182cf92d32a'; + process.env.GITHUB_SHA = '6389ff5bd287fd6948a7ccda8af8da4f0bbc856a'; const tag: string = await git.getTag(); console.log(`tag: ${tag}`); - expect(tag).toEqual('v1'); + expect(tag).toEqual('v2.2.1'); }); it('returns git tag through GITHUB_REF', async () => { process.env.GITHUB_REF = 'refs/tags/v2.2.1'; diff --git a/__tests__/github.test.ts b/__tests__/github.test.ts index 93e30202..0ee15d60 100644 --- a/__tests__/github.test.ts +++ b/__tests__/github.test.ts @@ -6,29 +6,29 @@ describe('github', () => { expect(release).not.toBeNull(); expect(release?.tag_name).not.toEqual(''); }); - it('returns v0.117.0 GoReleaser GitHub release', async () => { - const release = await github.getRelease('goreleaser', 'v0.117.0'); + it('returns v0.182.0 GoReleaser GitHub release', async () => { + const release = await github.getRelease('goreleaser', 'v0.182.0'); expect(release).not.toBeNull(); - expect(release?.tag_name).toEqual('v0.117.0'); + expect(release?.tag_name).toEqual('v0.182.0'); }); - it('returns v0.132.1 GoReleaser GitHub release', async () => { - const release = await github.getRelease('goreleaser', '~> 0.132'); + it('returns v0.182.1 GoReleaser GitHub release', async () => { + const release = await github.getRelease('goreleaser', '~> 0.182'); expect(release).not.toBeNull(); - expect(release?.tag_name).toEqual('v0.132.1'); + expect(release?.tag_name).toEqual('v0.182.1'); }); it('returns latest GoReleaser Pro GitHub release', async () => { const release = await github.getRelease('goreleaser-pro', 'latest'); expect(release).not.toBeNull(); expect(release?.tag_name).not.toEqual(''); }); - it('returns v0.166.0-pro GoReleaser Pro GitHub release', async () => { - const release = await github.getRelease('goreleaser-pro', 'v0.166.0-pro'); + it('returns v0.182.0-pro GoReleaser Pro GitHub release', async () => { + const release = await github.getRelease('goreleaser-pro', 'v0.182.0-pro'); expect(release).not.toBeNull(); - expect(release?.tag_name).toEqual('v0.166.0-pro'); + expect(release?.tag_name).toEqual('v0.182.0-pro'); }); - it('returns v0.166.1-pro GoReleaser Pro GitHub release when using semver', async () => { - const release = await github.getRelease('goreleaser-pro', '~> 0.166'); + it('returns v0.182.1-pro GoReleaser Pro GitHub release when using semver', async () => { + const release = await github.getRelease('goreleaser-pro', '~> 0.182'); expect(release).not.toBeNull(); - expect(release?.tag_name).toEqual('v0.166.1-pro'); + expect(release?.tag_name).toEqual('v0.182.1-pro'); }); }); diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts index b2c55718..0749c87e 100644 --- a/__tests__/installer.test.ts +++ b/__tests__/installer.test.ts @@ -2,8 +2,8 @@ import fs = require('fs'); import * as installer from '../src/installer'; describe('installer', () => { - it('acquires v0.117.0 version of GoReleaser', async () => { - const goreleaser = await installer.getGoReleaser('goreleaser', 'v0.117.0'); + it('acquires v0.182.0 version of GoReleaser', async () => { + const goreleaser = await installer.getGoReleaser('goreleaser', 'v0.182.0'); expect(fs.existsSync(goreleaser)).toBe(true); }, 100000); @@ -12,8 +12,8 @@ describe('installer', () => { expect(fs.existsSync(goreleaser)).toBe(true); }, 100000); - it('acquires v0.166.0-pro version of GoReleaser Pro', async () => { - const goreleaser = await installer.getGoReleaser('goreleaser-pro', 'v0.166.0-pro'); + it('acquires v0.182.0-pro version of GoReleaser Pro', async () => { + const goreleaser = await installer.getGoReleaser('goreleaser-pro', 'v0.182.0-pro'); expect(fs.existsSync(goreleaser)).toBe(true); }, 100000); diff --git a/dist/index.js b/dist/index.js index 9ca00c04..1a8a3567 100644 --- a/dist/index.js +++ b/dist/index.js @@ -265,6 +265,9 @@ const getFilename = (distribution) => { break; } } + if (osPlat == 'darwin') { + arch = 'all'; + } const platform = osPlat == 'win32' ? 'Windows' : osPlat == 'darwin' ? 'Darwin' : 'Linux'; const ext = osPlat == 'win32' ? 'zip' : 'tar.gz'; const suffix = pro.suffix(distribution); diff --git a/src/installer.ts b/src/installer.ts index 86b63a26..4aeffb65 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -66,6 +66,9 @@ const getFilename = (distribution: string): string => { break; } } + if (osPlat == 'darwin') { + arch = 'all'; + } const platform: string = osPlat == 'win32' ? 'Windows' : osPlat == 'darwin' ? 'Darwin' : 'Linux'; const ext: string = osPlat == 'win32' ? 'zip' : 'tar.gz'; const suffix: string = pro.suffix(distribution);