Skip to content

Commit

Permalink
fix: get darwin universal binary
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos A Becker <caarlos0@gmail.com>
  • Loading branch information
caarlos0 committed Oct 15, 2021
1 parent 69b075d commit 0399e93
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -26,7 +26,7 @@ jobs:
- windows-latest
version:
- latest
- '~> 0.166'
- '~> 0.182'
distribution:
- goreleaser
- goreleaser-pro
Expand Down
4 changes: 2 additions & 2 deletions __tests__/git.test.ts
Expand Up @@ -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';
Expand Down
24 changes: 12 additions & 12 deletions __tests__/github.test.ts
Expand Up @@ -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');
});
});
8 changes: 4 additions & 4 deletions __tests__/installer.test.ts
Expand Up @@ -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);

Expand All @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/installer.ts
Expand Up @@ -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);
Expand Down

0 comments on commit 0399e93

Please sign in to comment.