chore(deps): update dev deps (#294)

Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>

.github/workflows/ci.yml

@@ -26,7 +26,10 @@ jobs:
           - windows-latest
         version:
           - latest
-          - v0.145.0
+          - '~> 0.166'
+        distribution:
+          - goreleaser
+          - goreleaser-pro
     steps:
       -
         name: Checkout
@@ -37,7 +40,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
       -
         name: Check
         uses: ./
@@ -47,8 +50,12 @@ jobs:
           workdir: ./test
       -
         name: GoReleaser
+        if: ${{ !(github.event_name == 'pull_request' && matrix.distribution == 'goreleaser-pro') }}
         uses: ./
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
         with:
+          distribution: ${{ matrix.distribution }}
           version: ${{ matrix.version }}
           args: release --skip-publish --rm-dist
           workdir: ./test
@@ -60,7 +67,10 @@ jobs:
       matrix:
         version:
           - latest
-          - v0.145.0
+          - '~> 0.166'
+        distribution:
+          - goreleaser
+          - goreleaser-pro
     steps:
       -
         name: Checkout
@@ -71,15 +81,18 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
       -
         name: GoReleaser
+        if: ${{ !(github.event_name == 'pull_request' && matrix.distribution == 'goreleaser-pro') }}
         uses: ./
         with:
+          distribution: ${{ matrix.distribution }}
           version: ${{ matrix.version }}
           install-only: true
       -
         name: Check
+        if: ${{ !(github.event_name == 'pull_request' && matrix.distribution == 'goreleaser-pro') }}
         run: |
           goreleaser check --debug
 
@@ -103,7 +116,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
       -
         name: Import GPG key
         id: import_gpg
@@ -142,7 +155,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
       -
         name: Check
         uses: ./

.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

CHANGELOG.md

@@ -1,132 +0,0 @@
-# Changelog
-
-## 2.5.0 (2021/03/31)
-
-* Bump y18n from 4.0.0 to 4.0.1 (#272)
-* Bump @actions/http-client from 1.0.9 to 1.0.11 (#270)
-* Enhance workflow (#271)
-* Bump node-notifier from 8.0.0 to 8.0.1 (#263)
-
-## 2.4.1 (2020/12/02)
-
-* Do not overwrite GORELEASER_CURRENT_TAG if already declared (#260)
-
-## 2.4.0 (2020/11/30)
-
-* Set GORELEASER_CURRENT_TAG (#259)
-* Container based developer flow (#258)
-* Upload artifact example (#257)
-* Bump @actions/tool-cache from 1.6.0 to 1.6.1 (#256)
-
-## 2.3.0 (2020/11/06)
-
-* Add install-only option for using goreleaser in user scripts (#252)
-* Update deps
-
-## 2.2.1 (2020/10/01)
-
-* Fix CVE-2020-15228
-
-## 2.2.0 (2020/08/27)
-
-* Use GITHUB_REF to retrieve tag before checking the most recent tag (#238)
-* Update deps
-
-## 2.1.1 (2020/06/24)
-
-* Fix workdir (#224)
-
-## 2.1.0 (2020/06/15)
-
-* Implement (optional) semver parsing of version (#213)
-* Remove unshallow step (goreleaser/goreleaser#1608)
-
-## 2.0.2 (2020/05/10)
-
-* Use template in `sign.args`
-
-## 2.0.1 (2020/05/10)
-
-* Dummy release to mark v2 as latest on the marketplace
-
-## 2.0.0 (2020/05/10)
-
-* Remove `key` input and use [Import GPG](https://github.com/crazy-max/ghaction-import-gpg) GitHub Action instead.
-* Make `args` input as required
-* Go 1.14
-* Update deps
-
-## 1.5.1 (2020/05/10)
-
-* Mark `key` input as deprecated
-
-## 1.5.0 (2020/05/07)
-
-* Use native GitHub Action tools to download assets and use GitHub API
-* Fix unexpected output when tag not found
-* Use GitHub Action exec
-* Cleanup local paths from extra fields
-* Add notes about limitation with GITHUB_TOKEN (#58)
-* Add Codecov
-
-## 1.4.0 (2020/04/09)
-
-* Use ncc and clean workflows
-* Update deps
-
-## 1.3.1 (2020/02/14)
-
-* Don't fail on `getTag` (#98)
-
-## 1.3.0 (2020/02/11)
-
-* Improve git tag detection (#77)
-* Only handle snapshot flag for release cmd (#94)
-* Use `core.info` instead of `console.log`
-* Update deps
-* Update gitattributes
-
-## 1.2.1 (2020/01/20)
-
-* Update deps
-
-## 1.2.0 (2019/12/24)
-
-* Update deps
-
-## 1.1.0 (2019/12/02)
-
-* Add input to run GoReleaser from a subdirectory (#45)
-
-## 1.0.2 (2019/11/14)
-
-* Fix tsc gen
-
-## 1.0.1 (2019/11/14)
-
-* Update deps
-
-## 1.0.0 (2019/10/04)
-
-* Stable release
-* Update deps
-
-## 0.4.0 (2019/09/28)
-
-* Move repository to GoReleaser org (#3)
-
-## 0.3.0 (2019/09/26)
-
-* Artifact signing (#2)
-
-## 0.2.1 (2019/09/22)
-
-* Typo
-
-## 0.2.0 (2019/09/20)
-
-* Snapshot forced if no tag found
-
-## 0.1.0 (2019/09/20)
-
-* Initial version

README.md

@@ -57,10 +57,14 @@ jobs:
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
+          # either 'goreleaser' (default) or 'goreleaser-pro'
+          distribution: goreleaser
           version: latest
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
+          # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
 ```
 
 > **IMPORTANT**: note the `fetch-depth: 0` input in `Checkout` step. It is required  for the changelog to work correctly.
@@ -165,12 +169,13 @@ steps:
 
 Following inputs can be used as `step.with` keys
 
-| Name             | Type    | Default   | Description                               |
-|------------------|---------|-----------|-------------------------------------------|
-| `version`**¹**   | String  | `latest`  | GoReleaser version                        |
-| `args`           | String  |           | Arguments to pass to GoReleaser           |
-| `workdir`        | String  | `.`       | Working directory (below repository root) |
-| `install-only`   | Bool    | `false`   | Just install GoReleaser                   |
+| Name             | Type    | Default      | Description                                                      |
+|------------------|---------|--------------|------------------------------------------------------------------|
+| `distribution`   | String  | `goreleaser` | GoReleaser distribution, either `goreleaser` or `goreleaser-pro` |
+| `version`**¹**   | String  | `latest`     | GoReleaser version                                               |
+| `args`           | String  |              | Arguments to pass to GoReleaser                                  |
+| `workdir`        | String  | `.`          | Working directory (below repository root)                        |
+| `install-only`   | Bool    | `false`      | Just install GoReleaser                                          |
 
 > **¹** Can be a fixed version like `v0.117.0` or a max satisfying semver one like `~> 0.132`. In this case this will return `v0.132.1`.
 
@@ -178,17 +183,18 @@ Following inputs can be used as `step.with` keys
 
 Following environment variables can be used as `step.env` keys
 
-| Name           | Description                           |
-|----------------|---------------------------------------|
-| `GITHUB_TOKEN` | [GITHUB_TOKEN](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token) as provided by `secrets` |
+| Name             | Description                           |
+|------------------|---------------------------------------|
+| `GITHUB_TOKEN`   | [GITHUB_TOKEN](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token) as provided by `secrets` |
+| `GORELEASER_KEY` | Your [GoReleaser Pro](https://goreleaser.com/pro) License Key, in case you are using the `goreleaser-pro` distribution                              |
 
 ## Limitation
 
 `GITHUB_TOKEN` permissions [are limited to the repository](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#about-the-github_token-secret)
-that contains your workflow. 
+that contains your workflow.
 
 If you need to push the homebrew tap to another repository, you must therefore create a custom [Personal Access Token](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/)
-with `repo` permissions and [add it as a secret in the repository](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets). If you create a 
+with `repo` permissions and [add it as a secret in the repository](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets). If you create a
 secret named `GH_PAT`, the step will look like this:
 
 ```yaml

__tests__/github.test.ts

@@ -2,19 +2,33 @@ import * as github from '../src/github';
 
 describe('github', () => {
   it('returns latest GoReleaser GitHub release', async () => {
-    const release = await github.getRelease('latest');
+    const release = await github.getRelease('goreleaser', 'latest');
     expect(release).not.toBeNull();
     expect(release?.tag_name).not.toEqual('');
-    console.log(`tag_name: ${release?.tag_name}`);
   });
   it('returns v0.117.0 GoReleaser GitHub release', async () => {
-    const release = await github.getRelease('v0.117.0');
+    const release = await github.getRelease('goreleaser', 'v0.117.0');
     expect(release).not.toBeNull();
     expect(release?.tag_name).toEqual('v0.117.0');
   });
   it('returns v0.132.1 GoReleaser GitHub release', async () => {
-    const release = await github.getRelease('~> 0.132');
+    const release = await github.getRelease('goreleaser', '~> 0.132');
     expect(release).not.toBeNull();
     expect(release?.tag_name).toEqual('v0.132.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');
+    expect(release).not.toBeNull();
+    expect(release?.tag_name).toEqual('v0.166.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');
+    expect(release).not.toBeNull();
+    expect(release?.tag_name).toEqual('v0.166.1-pro');
+  });
 });

__tests__/installer.test.ts

@@ -3,12 +3,22 @@ import * as installer from '../src/installer';
 
 describe('installer', () => {
   it('acquires v0.117.0 version of GoReleaser', async () => {
-    const goreleaser = await installer.getGoReleaser('v0.117.0');
+    const goreleaser = await installer.getGoReleaser('goreleaser', 'v0.117.0');
     expect(fs.existsSync(goreleaser)).toBe(true);
   }, 100000);
 
   it('acquires latest version of GoReleaser', async () => {
-    const goreleaser = await installer.getGoReleaser('latest');
+    const goreleaser = await installer.getGoReleaser('goreleaser', 'latest');
+    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');
+    expect(fs.existsSync(goreleaser)).toBe(true);
+  }, 100000);
+
+  it('acquires latest version of GoReleaser Pro', async () => {
+    const goreleaser = await installer.getGoReleaser('goreleaser-pro', 'latest');
     expect(fs.existsSync(goreleaser)).toBe(true);
   }, 100000);
 });

__tests__/pro.test.ts

@@ -0,0 +1,10 @@
+import * as pro from '../src/pro';
+
+describe('pro', () => {
+  it('suffixes pro distribution', async () => {
+    expect(pro.suffix('goreleaser-pro')).toEqual('-pro');
+  });
+  it('does not suffix oss distribution', async () => {
+    expect(pro.suffix('goreleaser')).toEqual('');
+  });
+});

action.yml

@@ -7,6 +7,10 @@ branding:
   icon: 'package'
 
 inputs:
+  distribution:
+    description: 'GoReleaser Distribution (goreleaser or goreleaser-pro)'
+    default: 'goreleaser'
+    required: false
   version:
     description: 'GoReleaser version'
     default: 'latest'

package.json

@@ -21,23 +21,23 @@
   "author": "CrazyMax",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.6",
-    "@actions/exec": "^1.0.4",
+    "@actions/core": "^1.4.0",
+    "@actions/exec": "^1.1.0",
     "@actions/http-client": "^1.0.11",
-    "@actions/tool-cache": "^1.6.1"
+    "@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/github.ts

@@ -1,36 +1,44 @@
 import * as httpm from '@actions/http-client';
 import * as core from '@actions/core';
 import * as semver from 'semver';
+import * as pro from './pro';
 
 export interface GitHubRelease {
   id: number;
   tag_name: string;
 }
 
-export const getRelease = async (version: string): Promise<GitHubRelease | null> => {
-  const resolvedVersion: string = (await resolveVersion(version)) || version;
-  const url: string = `https://github.com/goreleaser/goreleaser/releases/${resolvedVersion}`;
+export const getRelease = async (distribution: string, version: string): Promise<GitHubRelease | null> => {
+  const resolvedVersion: string = (await resolveVersion(distribution, version)) || version;
+  const url: string = `https://github.com/goreleaser/${distribution}/releases/${resolvedVersion}`;
   const http: httpm.HttpClient = new httpm.HttpClient('goreleaser-action');
   return (await http.getJson<GitHubRelease>(url)).result;
 };
 
-const resolveVersion = async (version: string): Promise<string | null> => {
-  const allTags: Array<string> | null = await getAllTags();
+const resolveVersion = async (distribution: string, version: string): Promise<string | null> => {
+  const allTags: Array<string> | null = await getAllTags(distribution);
   if (!allTags) {
     throw new Error(`Cannot find GoReleaser tags`);
   }
   core.debug(`Found ${allTags.length} tags in total`);
 
-  return semver.maxSatisfying(allTags, version);
+  if (version === 'latest' || !pro.isPro(distribution)) {
+    return semver.maxSatisfying(allTags, version);
+  }
+
+  const cleanTags: Array<string> = allTags.map(tag => cleanTag(tag));
+  const cleanVersion: string = cleanTag(version);
+  return semver.maxSatisfying(cleanTags, cleanVersion) + pro.suffix(distribution);
 };
 
 interface GitHubTag {
   tag_name: string;
 }
 
-const getAllTags = async (): Promise<Array<string>> => {
+const getAllTags = async (distribution: string): Promise<Array<string>> => {
   const http: httpm.HttpClient = new httpm.HttpClient('goreleaser-action');
-  const url: string = `https://goreleaser.com/static/releases.json`;
+  const suffix: string = pro.suffix(distribution);
+  const url: string = `https://goreleaser.com/static/releases${suffix}.json`;
   const getTags = http.getJson<Array<GitHubTag>>(url);
 
   return getTags.then(response => {
@@ -41,3 +49,7 @@ const getAllTags = async (): Promise<Array<string>> => {
     return response.result.map(obj => obj.tag_name);
   });
 };
+
+const cleanTag = (tag: string): string => {
+  return tag.replace(/-pro$/, '');
+};

src/installer.ts

@@ -2,31 +2,32 @@ import * as os from 'os';
 import * as path from 'path';
 import * as util from 'util';
 import * as github from './github';
+import * as pro from './pro';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 
 const osPlat: string = os.platform();
 const osArch: string = os.arch();
 
-export async function getGoReleaser(version: string): Promise<string> {
-  const release: github.GitHubRelease | null = await github.getRelease(version);
+export async function getGoReleaser(distribution: string, version: string): Promise<string> {
+  const release: github.GitHubRelease | null = await github.getRelease(distribution, version);
   if (!release) {
     throw new Error(`Cannot find GoReleaser ${version} release`);
   }
 
-  core.info(`✅ GoReleaser version found: ${release.tag_name}`);
-  const filename = getFilename();
+  const filename = getFilename(distribution);
   const downloadUrl = util.format(
-    'https://github.com/goreleaser/goreleaser/releases/download/%s/%s',
+    'https://github.com/goreleaser/%s/releases/download/%s/%s',
+    distribution,
     release.tag_name,
     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);
@@ -44,9 +45,10 @@ export async function getGoReleaser(version: string): Promise<string> {
   return exePath;
 }
 
-const getFilename = (): string => {
+const getFilename = (distribution: string): string => {
   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';
-  return util.format('goreleaser_%s_%s.%s', platform, arch, ext);
+  const suffix: string = pro.suffix(distribution);
+  return util.format('goreleaser%s_%s_%s.%s', suffix, platform, arch, ext);
 };

src/main.ts

@@ -6,12 +6,13 @@ import {dirname} from 'path';
 
 async function run(): Promise<void> {
   try {
+    const distribution = core.getInput('distribution') || 'goreleaser';
     const version = core.getInput('version') || 'latest';
     const args = core.getInput('args');
     const workdir = core.getInput('workdir') || '.';
     const isInstallOnly = /^true$/i.test(core.getInput('install-only'));
-    const goreleaser = await installer.getGoReleaser(version);
-    core.info(`✅ GoReleaser installed successfully`);
+    const goreleaser = await installer.getGoReleaser(distribution, version);
+    core.info(`GoReleaser ${version} installed successfully`);
 
     if (isInstallOnly) {
       const goreleaserDir = dirname(goreleaser);
@@ -19,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);
     }
 
@@ -34,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;
     }

src/pro.ts

@@ -0,0 +1,7 @@
+export const suffix = (distribution: string): string => {
+  return isPro(distribution) ? '-pro' : '';
+};
+
+export const isPro = (distribution: string): boolean => {
+  return distribution === 'goreleaser-pro';
+};