Merge pull request #97 from tinact/fixed/sort

Fixed/sort
tinact · Jun 3, 2021 · c121d37 · c121d37
2 parents 7f160f2 + 651e35e
commit c121d37
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 1.0.3
+
+## Fixed
+
+- Fixing the sorting of larger numbers.
+
 ## 1.0.2
 
 ### Changed

diff --git a/dist/index.js b/dist/index.js
@@ -1006,7 +1006,7 @@ function run() {
             axios_1.default
                 .get(`https://hub.docker.com/v2/repositories/${imageName}/tags/`)
                 .then(response => {
-                const latest = _.last(_.remove(_.sortBy(_.map(response.data.results, 'name')), function (e) {
+                const latest = _.last(_.remove(_.map(response.data.results, 'name').sort((a, b) => a.localeCompare(b, undefined, { numeric: true })), function (e) {
                     return semver.validRange(e);
                 }));
                 core.setOutput('latest', latest);

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "main": "lib/main.js",
   "scripts": {
     "build": "tsc",
-    "lint": "eslint src/**/*.ts",
+    "lint": "eslint src/**/*.ts --fix",
     "pack": "ncc build lib/main.js",
     "test": "jest",
     "all": "npm run build && npm run lint && npm run pack"

diff --git a/src/main.ts b/src/main.ts
@@ -12,7 +12,7 @@ async function run(): Promise<void> {
       .then(response => {
         const latest = _.last(
           _.remove(
-            _.sortBy(_.map(response.data.results, 'name')),
+            _.map(response.data.results, 'name').sort( (a, b) => a.localeCompare(b, undefined, { numeric:true }) ),
             function (e) {
               return semver.validRange(e)
             }