From 8598daacd630436825d63e95bad31b64db6b5289 Mon Sep 17 00:00:00 2001
From: Olivier Lamothe <olamothe@coveo.com>
Date: Mon, 1 Mar 2021 13:46:06 -0500
Subject: [PATCH] chore(packaging): fix deb packaging (#57)

https://coveord.atlassian.net/browse/CDX-107
---
 .github/workflows/build-binaries.yml             |  6 +++++-
 packages/cli/package.json                        |  2 +-
 packages/cli/patches/@oclif+dev-cli+1.26.0.patch | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 packages/cli/patches/@oclif+dev-cli+1.26.0.patch

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 3e168e9965..d1e2a4e550 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -3,6 +3,7 @@ name: Build binaries
 on:
   release:
     types: [published]
+
 jobs:
   package:
     name: Package for ${{ matrix.pack-command }}
@@ -17,6 +18,9 @@ jobs:
           - os: ubuntu-latest
             pack-command: win
             additional-install: sudo apt-get install nsis p7zip-full -y
+          - os: ubuntu-latest
+            pack-command: deb
+            additional-install: echo "no additional install"
 
     steps:
       - uses: actions/checkout@v2
@@ -29,7 +33,7 @@ jobs:
         run: ${{ matrix.additional-install }}
       - name: Create package
         working-directory: ./packages/cli
-        run: npx @oclif/dev-cli pack:${{ matrix.pack-command }}
+        run: ./node_modules/@oclif/dev-cli/bin/run pack:${{ matrix.pack-command }}
       - name: Upload binaries
         uses: svenstaro/upload-release-action@v2
         with:
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5290e613fa..6d1f32f4df 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@coveo/cra-template": "^0.3.0",
-    "@oclif/dev-cli": "^1",
+    "@oclif/dev-cli": "^1.26.0",
     "@oclif/test": "^1",
     "@types/fs-extra": "^9.0.6",
     "@types/node": "^10",
diff --git a/packages/cli/patches/@oclif+dev-cli+1.26.0.patch b/packages/cli/patches/@oclif+dev-cli+1.26.0.patch
new file mode 100644
index 0000000000..091ef3f87d
--- /dev/null
+++ b/packages/cli/patches/@oclif+dev-cli+1.26.0.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/@oclif/dev-cli/lib/commands/pack/deb.js b/node_modules/@oclif/dev-cli/lib/commands/pack/deb.js
+index 885416e..deb28c3 100644
+--- a/node_modules/@oclif/dev-cli/lib/commands/pack/deb.js
++++ b/node_modules/@oclif/dev-cli/lib/commands/pack/deb.js
+@@ -73,8 +73,8 @@ class PackDeb extends command_1.Command {
+             await qq.write([workspace, 'DEBIAN/control'], scripts.control(buildConfig, debArch(arch)));
+             await qq.chmod([workspace, 'usr/lib', config.dirname, 'bin', config.bin], 0o755);
+             await qq.x(`ln -s "../lib/${config.dirname}/bin/${config.bin}" "${workspace}/usr/bin/${config.bin}"`);
+-            await qq.x(`chown -R root "${workspace}"`);
+-            await qq.x(`chgrp -R root "${workspace}"`);
++            await qq.x(`sudo chown -R root "${workspace}"`);
++            await qq.x(`sudo chgrp -R root "${workspace}"`);
+             await qq.x(`dpkg --build "${workspace}" "${qq.join(dist, `${versionedDebBase}.deb`)}"`);
+         };
+         const arches = _.uniq(buildConfig.targets