feat(version): Support for patch verison

This commit is to support X.Y.Z version in config. - if X.Y.Z version is passed, honour it 👍 - if X.Y version is passed, keep the same behaviour as it is right now. Closes #98 Signed-off-by: Tam Mach <sayboras@yahoo.com>
golangci · Oct 12, 2020 · 31602eb · 31602eb
1 parent 54a84d4
commit 31602eb
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 15 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,3 +29,20 @@ jobs:
           version: latest
           args: --issues-exit-code=0 ./sample/...
           only-new-issues: true
+
+  # Test with full version vX.Y.Z
+  test-full-version:
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./
+        with:
+          version: v1.31.0
+          args: --issues-exit-code=0 ./sample/...
+          only-new-issues: true
diff --git a/action.yml b/action.yml
@@ -4,7 +4,7 @@ description: "Official golangci-lint action with line-attached annotations for f
 author: "golangci"
 inputs:
   version:
-    description: "version of golangci-lint to use in form of v1.2 or `latest` to use the latest version"
+    description: "version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version"
     required: false
   args:
     description: "golangci-lint command line arguments"

diff --git a/dist/post_run/index.js b/dist/post_run/index.js
@@ -2099,9 +2099,6 @@ const getRequestedLintVersion = () => {
     if (parsedRequestedLintVersion == null) {
         return null;
     }
-    if (parsedRequestedLintVersion.patch !== null) {
-        throw new Error(`requested golangci-lint version '${requestedLintVersion}' was specified with the patch version, need specify only minor version`);
-    }
     if (isLessVersion(parsedRequestedLintVersion, minVersion)) {
         throw new Error(`requested golangci-lint version '${requestedLintVersion}' isn't supported: we support only ${exports.stringifyVersion(minVersion)} and later versions`);
     }
@@ -2128,13 +2125,23 @@ const getConfig = () => __awaiter(void 0, void 0, void 0, function* () {
 function findLintVersion() {
     return __awaiter(this, void 0, void 0, function* () {
         core.info(`Finding needed golangci-lint version...`);
+        const reqLintVersion = getRequestedLintVersion();
+        // if the patched version is passed, just use it
+        if ((reqLintVersion === null || reqLintVersion === void 0 ? void 0 : reqLintVersion.major) !== null && (reqLintVersion === null || reqLintVersion === void 0 ? void 0 : reqLintVersion.minor) != null && (reqLintVersion === null || reqLintVersion === void 0 ? void 0 : reqLintVersion.patch) !== null) {
+            new Promise((resolve) => {
+                const versionWithoutV = `${reqLintVersion.major}.${reqLintVersion.minor}${reqLintVersion.patch}`;
+                resolve({
+                    TargetVersion: `v${versionWithoutV}`,
+                    AssetURL: `https://github.com/golangci/golangci-lint/releases/download/v${versionWithoutV}/golangci-lint-${versionWithoutV}-linux-amd64.tar.gz`,
+                });
+            });
+        }
         const startedAt = Date.now();
         const config = yield getConfig();
         if (!config.MinorVersionToConfig) {
             core.warning(JSON.stringify(config));
             throw new Error(`invalid config: no MinorVersionToConfig field`);
         }
-        const reqLintVersion = getRequestedLintVersion();
         const versionConfig = config.MinorVersionToConfig[exports.stringifyVersion(reqLintVersion)];
         if (!versionConfig) {
             throw new Error(`requested golangci-lint version '${exports.stringifyVersion(reqLintVersion)}' doesn't exist`);

diff --git a/dist/run/index.js b/dist/run/index.js
@@ -2099,9 +2099,6 @@ const getRequestedLintVersion = () => {
     if (parsedRequestedLintVersion == null) {
         return null;
     }
-    if (parsedRequestedLintVersion.patch !== null) {
-        throw new Error(`requested golangci-lint version '${requestedLintVersion}' was specified with the patch version, need specify only minor version`);
-    }
     if (isLessVersion(parsedRequestedLintVersion, minVersion)) {
         throw new Error(`requested golangci-lint version '${requestedLintVersion}' isn't supported: we support only ${exports.stringifyVersion(minVersion)} and later versions`);
     }
@@ -2128,13 +2125,23 @@ const getConfig = () => __awaiter(void 0, void 0, void 0, function* () {
 function findLintVersion() {
     return __awaiter(this, void 0, void 0, function* () {
         core.info(`Finding needed golangci-lint version...`);
+        const reqLintVersion = getRequestedLintVersion();
+        // if the patched version is passed, just use it
+        if ((reqLintVersion === null || reqLintVersion === void 0 ? void 0 : reqLintVersion.major) !== null && (reqLintVersion === null || reqLintVersion === void 0 ? void 0 : reqLintVersion.minor) != null && (reqLintVersion === null || reqLintVersion === void 0 ? void 0 : reqLintVersion.patch) !== null) {
+            new Promise((resolve) => {
+                const versionWithoutV = `${reqLintVersion.major}.${reqLintVersion.minor}${reqLintVersion.patch}`;
+                resolve({
+                    TargetVersion: `v${versionWithoutV}`,
+                    AssetURL: `https://github.com/golangci/golangci-lint/releases/download/v${versionWithoutV}/golangci-lint-${versionWithoutV}-linux-amd64.tar.gz`,
+                });
+            });
+        }
         const startedAt = Date.now();
         const config = yield getConfig();
         if (!config.MinorVersionToConfig) {
             core.warning(JSON.stringify(config));
             throw new Error(`invalid config: no MinorVersionToConfig field`);
         }
-        const reqLintVersion = getRequestedLintVersion();
         const versionConfig = config.MinorVersionToConfig[exports.stringifyVersion(reqLintVersion)];
         if (!versionConfig) {
             throw new Error(`requested golangci-lint version '${exports.stringifyVersion(reqLintVersion)}' doesn't exist`);

diff --git a/src/version.ts b/src/version.ts
@@ -61,11 +61,6 @@ const getRequestedLintVersion = (): Version => {
   if (parsedRequestedLintVersion == null) {
     return null
   }
-  if (parsedRequestedLintVersion.patch !== null) {
-    throw new Error(
-      `requested golangci-lint version '${requestedLintVersion}' was specified with the patch version, need specify only minor version`
-    )
-  }
   if (isLessVersion(parsedRequestedLintVersion, minVersion)) {
     throw new Error(
       `requested golangci-lint version '${requestedLintVersion}' isn't supported: we support only ${stringifyVersion(
@@ -109,6 +104,17 @@ const getConfig = async (): Promise<Config> => {
 
 export async function findLintVersion(): Promise<VersionConfig> {
   core.info(`Finding needed golangci-lint version...`)
+  const reqLintVersion = getRequestedLintVersion()
+  // if the patched version is passed, just use it
+  if (reqLintVersion?.major !== null && reqLintVersion?.minor != null && reqLintVersion?.patch !== null) {
+    new Promise((resolve) => {
+      const versionWithoutV = `${reqLintVersion.major}.${reqLintVersion.minor}${reqLintVersion.patch}`
+      resolve({
+        TargetVersion: `v${versionWithoutV}`,
+        AssetURL: `https://github.com/golangci/golangci-lint/releases/download/v${versionWithoutV}/golangci-lint-${versionWithoutV}-linux-amd64.tar.gz`,
+      })
+    })
+  }
   const startedAt = Date.now()
 
   const config = await getConfig()
@@ -117,7 +123,6 @@ export async function findLintVersion(): Promise<VersionConfig> {
     throw new Error(`invalid config: no MinorVersionToConfig field`)
   }
 
-  const reqLintVersion = getRequestedLintVersion()
   const versionConfig = config.MinorVersionToConfig[stringifyVersion(reqLintVersion)]
   if (!versionConfig) {
     throw new Error(`requested golangci-lint version '${stringifyVersion(reqLintVersion)}' doesn't exist`)