Update CHANGELOG

Bumps [actions/checkout](https://github.com/actions/checkout) from v2.3.2 to v2.3.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.3.2...a81bbbf8298c0fa03ea29cdc473d45769f953675)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2.3.3
         with:
           fetch-depth: 0
       -
@@ -61,7 +61,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2.3.3
         with:
           fetch-depth: 0
       -
@@ -72,10 +72,10 @@ jobs:
       -
         name: Import GPG key
         id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v2
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY_TEST }}
-          PASSPHRASE: ${{ secrets.PASSPHRASE_TEST }}
+        uses: crazy-max/ghaction-import-gpg@v3
+        with:
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY_TEST }}
+          passphrase: ${{ secrets.PASSPHRASE_TEST }}
       -
         name: Check
         uses: ./

.github/workflows/pre-checkin.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2.3.3
       -
         name: Install
         run: yarn install

.github/workflows/test.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2.3.3
         with:
           fetch-depth: 0
       -
@@ -35,7 +35,7 @@ jobs:
         run: yarn run test
       -
         name: Upload coverage
-        uses: codecov/codecov-action@v1.0.7
+        uses: codecov/codecov-action@v1.0.13
         if: success()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 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)

README.md

@@ -97,10 +97,10 @@ If [signing is enabled](https://goreleaser.com/customization/#Signing) in your G
       -
         name: Import GPG key
         id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v2
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.PASSPHRASE }}
+        uses: crazy-max/ghaction-import-gpg@v3
+        with:
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

__tests__/git.test.ts

@@ -1,15 +1,30 @@
 import * as git from '../src/git';
 
 describe('git', () => {
-  it('returns git tag', async () => {
+  it('returns git tag through describe', async () => {
+    process.env.GITHUB_SHA = '309312125ed7a32fcd48f3a1e24dcafe669c186a';
     const tag: string = await git.getTag();
+    console.log(`tag: ${tag}`);
     expect(tag).not.toEqual('');
   });
+  it('returns git tag through GITHUB_SHA', async () => {
+    process.env.GITHUB_SHA = '6e37040623d14330555c7be1603a9182cf92d32a';
+    const tag: string = await git.getTag();
+    console.log(`tag: ${tag}`);
+    expect(tag).toEqual('v1');
+  });
+  it('returns git tag through GITHUB_REF', async () => {
+    process.env.GITHUB_REF = 'refs/tags/v2.2.1';
+    const tag: string = await git.getTag();
+    console.log(`tag: ${tag}`);
+    expect(tag).toEqual('v2.2.1');
+  });
   it('checks if tag is dirty', async () => {
     expect(await git.isTagDirty('v1.3.1')).toBe(true);
   });
   it('returns short commit', async () => {
     const commit: string = await git.getShortCommit();
+    console.log(`commit: ${commit}`);
     expect(commit).not.toEqual('');
   });
 });

__tests__/github.test.ts

@@ -5,6 +5,7 @@ describe('github', () => {
     const release = await github.getRelease('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');

package.json

@@ -21,23 +21,23 @@
   "author": "CrazyMax",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.4",
+    "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.4",
     "@actions/http-client": "^1.0.8",
-    "@actions/tool-cache": "^1.5.5"
+    "@actions/tool-cache": "^1.6.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.0",
-    "@types/node": "^14.0.13",
-    "@zeit/ncc": "^0.22.3",
+    "@types/jest": "^26.0.14",
+    "@types/node": "^14.11.2",
+    "@vercel/ncc": "^0.24.1",
     "dotenv": "^8.2.0",
-    "jest": "^26.1.0",
-    "jest-circus": "^26.1.0",
-    "jest-runtime": "^26.1.0",
-    "prettier": "^2.0.5",
+    "jest": "^26.4.2",
+    "jest-circus": "^26.4.2",
+    "jest-runtime": "^26.4.2",
+    "prettier": "^2.1.2",
     "tmp": "^0.2.1",
-    "ts-jest": "^26.1.1",
-    "typescript": "^3.9.5",
+    "ts-jest": "^26.4.1",
+    "typescript": "^4.0.3",
     "typescript-formatter": "^7.2.2"
   }
 }

src/git.ts

@@ -11,7 +11,20 @@ const git = async (args: string[] = []): Promise<string> => {
 
 export async function getTag(): Promise<string> {
   try {
-    return await git(['describe', '--tags', '--abbrev=0']);
+    if ((process.env.GITHUB_REF || '').startsWith('refs/tags')) {
+      const tag = (process.env.GITHUB_REF || '').split('/').pop();
+      if (tag !== '' && tag !== undefined) {
+        return tag;
+      }
+    }
+    return await git(['tag', '--points-at', `${process.env.GITHUB_SHA}`, '--sort', '-version:creatordate']).then(
+      tags => {
+        if (tags.length == 0) {
+          return git(['describe', '--tags', '--abbrev=0']);
+        }
+        return tags.split('\n')[0];
+      }
+    );
   } catch (err) {
     return '';
   }