fix: get darwin universal binary (#312)

Signed-off-by: Carlos A Becker <caarlos0@gmail.com>

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
           - windows-latest
         version:
           - latest
-          - '~> 0.166'
+          - '~> 0.182'
         distribution:
           - goreleaser
           - goreleaser-pro
@@ -120,9 +120,9 @@ jobs:
       -
         name: Import GPG key
         id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v3
+        uses: crazy-max/ghaction-import-gpg@v4
         with:
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY_TEST }}
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY_TEST }}
           passphrase: ${{ secrets.PASSPHRASE_TEST }}
       -
         name: Check

.github/workflows/test.yml

@@ -31,6 +31,6 @@ jobs:
           targets: test
       -
         name: Upload coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
           file: ./coverage/clover.xml

README.md

@@ -98,15 +98,16 @@ Or with a condition on GoReleaser step:
 
 ### Signing
 
-If [signing is enabled](https://goreleaser.com/customization/#Signing) in your GoReleaser configuration, you can use the [Import GPG](https://github.com/crazy-max/ghaction-import-gpg) GitHub Action along with this one:
+If [signing is enabled](https://goreleaser.com/customization/#Signing) in your GoReleaser configuration, you can use
+the [Import GPG](https://github.com/crazy-max/ghaction-import-gpg) GitHub Action along with this one:
 
 ```yaml
       -
         name: Import GPG key
         id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v3
+        uses: crazy-max/ghaction-import-gpg@v4
         with:
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
       -
         name: Run GoReleaser

__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';

__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');
   });
 });

__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);
 

package.json

@@ -21,23 +21,23 @@
   "author": "CrazyMax",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.3.0",
-    "@actions/exec": "^1.0.4",
+    "@actions/core": "^1.6.0",
+    "@actions/exec": "^1.1.0",
     "@actions/http-client": "^1.0.11",
-    "@actions/tool-cache": "^1.7.0"
+    "@actions/tool-cache": "^1.7.1"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.14",
-    "@types/node": "^14.11.2",
-    "@vercel/ncc": "^0.24.1",
-    "dotenv": "^8.2.0",
-    "jest": "^26.4.2",
-    "jest-circus": "^26.4.2",
-    "jest-runtime": "^26.4.2",
-    "prettier": "^2.1.2",
+    "@types/jest": "^26.0.24",
+    "@types/node": "^14.17.6",
+    "@vercel/ncc": "^0.28.6",
+    "dotenv": "^8.6.0",
+    "jest": "^26.6.3",
+    "jest-circus": "^26.6.3",
+    "jest-runtime": "^26.6.3",
+    "prettier": "^2.3.2",
     "tmp": "^0.2.1",
-    "ts-jest": "^26.4.1",
-    "typescript": "^4.0.3",
+    "ts-jest": "^26.5.6",
+    "typescript": "^4.3.5",
     "typescript-formatter": "^7.2.2"
   }
 }

src/exec.ts

@@ -1,34 +0,0 @@
-import * as actionsExec from '@actions/exec';
-import {ExecOptions} from '@actions/exec';
-
-export interface ExecResult {
-  success: boolean;
-  stdout: string;
-  stderr: string;
-}
-
-export const exec = async (command: string, args: string[] = [], silent: boolean): Promise<ExecResult> => {
-  let stdout: string = '';
-  let stderr: string = '';
-
-  const options: ExecOptions = {
-    silent: silent,
-    ignoreReturnCode: true
-  };
-  options.listeners = {
-    stdout: (data: Buffer) => {
-      stdout += data.toString();
-    },
-    stderr: (data: Buffer) => {
-      stderr += data.toString();
-    }
-  };
-
-  const returnCode: number = await actionsExec.exec(command, args, options);
-
-  return {
-    success: returnCode === 0,
-    stdout: stdout.trim(),
-    stderr: stderr.trim()
-  };
-};

src/git.ts

@@ -1,12 +1,17 @@
-import * as exec from './exec';
+import * as exec from '@actions/exec';
 
 const git = async (args: string[] = []): Promise<string> => {
-  return await exec.exec(`git`, args, true).then(res => {
-    if (res.stderr != '' && !res.success) {
-      throw new Error(res.stderr);
-    }
-    return res.stdout.trim();
-  });
+  return await exec
+    .getExecOutput(`git`, args, {
+      ignoreReturnCode: true,
+      silent: true
+    })
+    .then(res => {
+      if (res.stderr.length > 0 && res.exitCode != 0) {
+        throw new Error(res.stderr);
+      }
+      return res.stdout.trim();
+    });
 };
 
 export async function getTag(): Promise<string> {

src/installer.ts

@@ -15,7 +15,6 @@ export async function getGoReleaser(distribution: string, version: string): Prom
     throw new Error(`Cannot find GoReleaser ${version} release`);
   }
 
-  core.info(`✅ GoReleaser version found: ${release.tag_name}`);
   const filename = getFilename(distribution);
   const downloadUrl = util.format(
     'https://github.com/goreleaser/%s/releases/download/%s/%s',
@@ -24,11 +23,11 @@ export async function getGoReleaser(distribution: string, version: string): Prom
     filename
   );
 
-  core.info(`⬇️ Downloading ${downloadUrl}...`);
+  core.info(`Downloading ${downloadUrl}`);
   const downloadPath: string = await tc.downloadTool(downloadUrl);
   core.debug(`Downloaded to ${downloadPath}`);
 
-  core.info('📦 Extracting GoReleaser...');
+  core.info('Extracting GoReleaser');
   let extPath: string;
   if (osPlat == 'win32') {
     extPath = await tc.extractZip(downloadPath);
@@ -47,8 +46,30 @@ export async function getGoReleaser(distribution: string, version: string): Prom
 }
 
 const getFilename = (distribution: string): string => {
+  let arch: string;
+  switch (osArch) {
+    case 'x64': {
+      arch = 'x86_64';
+      break;
+    }
+    case 'x32': {
+      arch = 'i386';
+      break;
+    }
+    case 'arm': {
+      const arm_version = (process.config.variables as any).arm_version;
+      arch = arm_version ? 'armv' + arm_version : 'arm';
+      break;
+    }
+    default: {
+      arch = osArch;
+      break;
+    }
+  }
+  if (osPlat == 'darwin') {
+    arch = 'all';
+  }
   const platform: string = osPlat == 'win32' ? 'Windows' : osPlat == 'darwin' ? 'Darwin' : 'Linux';
-  const arch: string = osArch == 'x64' ? 'x86_64' : 'i386';
   const ext: string = osPlat == 'win32' ? 'zip' : 'tar.gz';
   const suffix: string = pro.suffix(distribution);
   return util.format('goreleaser%s_%s_%s.%s', suffix, platform, arch, ext);

src/main.ts

@@ -12,7 +12,7 @@ async function run(): Promise<void> {
     const workdir = core.getInput('workdir') || '.';
     const isInstallOnly = /^true$/i.test(core.getInput('install-only'));
     const goreleaser = await installer.getGoReleaser(distribution, version);
-    core.info(`✅ GoReleaser installed successfully`);
+    core.info(`GoReleaser ${version} installed successfully`);
 
     if (isInstallOnly) {
       const goreleaserDir = dirname(goreleaser);
@@ -20,11 +20,12 @@ async function run(): Promise<void> {
       core.debug(`Added ${goreleaserDir} to PATH`);
       return;
     } else if (!args) {
-      throw new Error('args input required');
+      core.setFailed('args input required');
+      return;
     }
 
     if (workdir && workdir !== '.') {
-      core.info(`📂 Using ${workdir} as working directory...`);
+      core.info(`Using ${workdir} as working directory`);
       process.chdir(workdir);
     }
 
@@ -35,16 +36,15 @@ async function run(): Promise<void> {
     let snapshot = '';
     if (args.split(' ').indexOf('release') > -1) {
       if (isTagDirty) {
-        core.info(`⚠️ No tag found for commit ${commit}. Snapshot forced`);
+        core.info(`No tag found for commit ${commit}. Snapshot forced`);
         if (!args.includes('--snapshot')) {
           snapshot = ' --snapshot';
         }
       } else {
-        core.info(`✅ ${tag} tag found for commit ${commit}`);
+        core.info(`${tag} tag found for commit ${commit}`);
       }
     }
 
-    core.info('🏃 Running GoReleaser...');
     if (!('GORELEASER_CURRENT_TAG' in process.env)) {
       process.env.GORELEASER_CURRENT_TAG = tag;
     }