test new linux version string

Cyberbeni · Oct 9, 2020 · df7dc5b · df7dc5b
1 parent 1d75ecc
commit df7dc5b
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 19 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ jobs:
   test:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-18.04, ubuntu-20.04, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout

diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -6,8 +6,10 @@ import { exec } from '../src/helpers'
 // const url = 'https://github.com/realm/SwiftLint'
 
 test('Local test', async() => {
+  const osVersion = `${os.type()}-${os.release()}`
+  console.log(osVersion)
   const swiftVersion = await exec('swift', ['-version'])
-  let additionalInfo = `${os.version()}-${swiftVersion}`
+  let additionalInfo = `${osVersion}-${swiftVersion}`
   if (os.platform() == "darwin") {
     let macVersion = await exec('sw_vers', ['-productVersion'])
     if (semver.gte(macVersion, "10.14.4")) {

diff --git a/dist/index.js b/dist/index.js
diff --git a/lib/helpers.js b/lib/helpers.js
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -15,14 +15,28 @@ export async function exec(commandLine: string, args?: string[]): Promise<string
 }
 
 export async function getUuid(url: string, commitHash: string): Promise<string> {
-  const osVersion = await exec('uname', ['-v']) // os.version is somehow undefined on GitHub runner
-  const swiftVersion = await exec('swift', ['-version'])
-  let additionalInfo = `${osVersion}-${swiftVersion}`
-  core.info(additionalInfo)
-  if (os.platform() == "darwin") {
-    let macVersion = await exec('sw_vers', ['-productVersion'])
-    if (semver.gte(macVersion, "10.14.4")) {
-      additionalInfo = `macos-${os.arch()}`
+  let additionalInfo: string
+  switch (os.platform()) {
+    case "darwin": {
+      let macVersion = await exec('sw_vers', ['-productVersion'])
+      if (semver.gte(macVersion, "10.14.4")) {
+        additionalInfo = `macos-${os.arch()}`
+      } else {
+        additionalInfo = `macos-embed-swift-${os.arch()}`
+      }
+      break
+    }
+    case "linux": {
+      const osCodename = await exec('lsb_release', ['-c'])
+      const kernelVersion = os.release()
+      const swiftVersion = await exec('swift', ['-version'])
+      additionalInfo = `${osCodename}-${kernelVersion}-${swiftVersion}`
+      break
+    }
+    default: {
+      const osVersion = await exec('uname', ['-v']) // os.version is somehow undefined on GitHub runner
+      const swiftVersion = await exec('swift', ['-version'])
+      additionalInfo = `${osVersion}-${swiftVersion}`
     }
   }
   core.info(additionalInfo)