Merge branch 'main' into feat/configurable-verification-rule

Author: e-fisher

.github/workflows/release.yml

@@ -10,9 +10,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # linux disabled until we get to work to support it
-        #platform: [macos-latest, ubuntu-20.04, windows-latest]
-        platform: [macos-latest, windows-latest]
+        # There is a bug on Ubuntu 22.04 (ubuntu-latest) regarding stripping a binary for a different
+        # architecture. Since we include both x86_64 and arm64 in linux a solution is to use ubuntu 20.04
+        # https://github.com/electron/forge/issues/3102
+        # https://github.com/electron/forge/issues/3701
+        platform: [macos-latest, windows-latest, ubuntu-20.04]
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -91,6 +93,22 @@ jobs:
           SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
         run: npm run publish
 
+      - name: publish Linux
+        if: startsWith(matrix.platform, 'ubuntu-')
+        env:
+          NODE_OPTIONS: '--max_old_space_size=8192'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # sentry integration
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          # sentry vite plugin integration during build
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ vars.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
+        run: |
+          sudo apt install -y rpm
+          npm run publish
+          npm run publish -- --arch=arm64
+
       - name: cleanup macos certificates
         if: startsWith(matrix.platform, 'macos-')
         run: |

forge.config.ts

@@ -16,13 +16,17 @@ function getPlatformSpecificResources() {
   // Otherwise the x86_64 build will still be having the resources/arm64 only binaries
   if (getPlatform() === 'mac') {
     return ['./resources/mac/arm64', './resources/mac/x86_64']
+  } else if (getPlatform() === 'linux') {
+    return ['./resources/linux/arm64', './resources/linux/x86_64']
   }
 
   return [path.join('./resources/', getPlatform(), getArch())]
 }
 
 const config: ForgeConfig = {
   packagerConfig: {
+    name: 'Grafana k6 Studio',
+    executableName: 'k6-studio',
     icon: './resources/icons/logo',
     asar: true,
     extraResource: [
@@ -64,9 +68,8 @@ const config: ForgeConfig = {
       },
       ['darwin']
     ),
-    new MakerRpm({}),
-    new MakerRpm({}),
-    new MakerDeb({ options: { icon: './src/assets/icons/logo.png' } }),
+    new MakerRpm({ options: { icon: './resources/icons/logo.png' } }),
+    new MakerDeb({ options: { icon: './resources/icons/logo.png' } }),
   ],
   plugins: [
     new VitePlugin({

install-k6.js

@@ -5,6 +5,8 @@ const K6_VERSION = 'v0.55.0'
 const K6_PATH_MAC_AMD = `k6-${K6_VERSION}-macos-amd64`
 const K6_PATH_MAC_ARM = `k6-${K6_VERSION}-macos-arm64`
 const K6_PATH_WIN_AMD = `k6-${K6_VERSION}-windows-amd64`
+const K6_PATH_LINUX_AMD = `k6-${K6_VERSION}-linux-amd64`
+const K6_PATH_LINUX_ARM = `k6-${K6_VERSION}-linux-arm64`
 
 const getMacOSK6Binary = () => {
   const command = `
@@ -52,6 +54,32 @@ Remove-Item -Path "${K6_PATH_WIN_AMD}" -Recurse
   execSync(command, { shell: 'powershell.exe' })
 }
 
+const getLinuxK6Binary = () => {
+  const command = `
+# download binaries
+curl -LO https://github.com/grafana/k6/releases/download/${K6_VERSION}/${K6_PATH_LINUX_AMD}.tar.gz
+curl -LO https://github.com/grafana/k6/releases/download/${K6_VERSION}/${K6_PATH_LINUX_ARM}.tar.gz
+
+# unzip & smoke test
+tar -zxf ${K6_PATH_LINUX_AMD}.tar.gz
+tar -zxf ${K6_PATH_LINUX_ARM}.tar.gz
+${K6_PATH_LINUX_AMD}/k6 version
+# ${K6_PATH_LINUX_ARM}/k6 version  ## if we move to separate images for architectures we could test this one as well
+
+# move to resource folder
+mv ${K6_PATH_LINUX_AMD}/k6 resources/linux/x86_64
+mv ${K6_PATH_LINUX_ARM}/k6 resources/linux/arm64
+
+# cleanup
+rm ${K6_PATH_LINUX_AMD}.tar.gz
+rm ${K6_PATH_LINUX_ARM}.tar.gz
+rmdir ${K6_PATH_LINUX_AMD}
+rmdir ${K6_PATH_LINUX_ARM}
+`
+
+  execSync(command)
+}
+
 switch (process.platform) {
   case 'darwin':
     // we check only for one arch since we include both binaries
@@ -70,6 +98,15 @@ switch (process.platform) {
       console.log('k6 binary download completed')
     }
     break
+  case 'linux':
+    // we check only for one arch since we include both binaries
+    if (!existsSync('resources/linux/x86_64/k6')) {
+      console.log('k6 binary not found')
+      console.log('downloading k6... this might take some time...')
+      getLinuxK6Binary()
+      console.log('k6 binary download completed')
+    }
+    break
   default:
     console.log(`unsupported platform found: ${process.platform}`)
 }