From 97bf8bf295a7b4bfd35a3ba30935ee542425bfc6 Mon Sep 17 00:00:00 2001
From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com>
Date: Sat, 12 Nov 2022 02:29:15 -0500
Subject: [PATCH] ci: fix missing envs in build workflow (#891)

Made a mistake in not testing properly and broke the build workflow with
missing envs.
---
 .github/workflows/build_releases.yml | 12 ++----------
 .github/workflows/ci.yml             |  2 ++
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_releases.yml b/.github/workflows/build_releases.yml
index 072c690a..f4d5d4df 100644
--- a/.github/workflows/build_releases.yml
+++ b/.github/workflows/build_releases.yml
@@ -23,6 +23,8 @@ env:
   CARGO_INCREMENTAL: 0
   CARGO_PROFILE_DEV_DEBUG: 0
   CARGO_HUSKY_DONT_INSTALL_HOOKS: true
+  COMPLETION_DIR: "target/tmp/bottom/completion/"
+  MANPAGE_DIR: "target/tmp/bottom/manpage/"
 
 jobs:
   build-binaries:
@@ -145,8 +147,6 @@ jobs:
       - name: Build
         uses: ClementTsang/cargo-action@v0.0.3
         env:
-          COMPLETION_DIR: "target/tmp/bottom/completion/"
-          MANPAGE_DIR: "target/tmp/bottom/manpage/"
           BTM_GENERATE: true
         with:
           command: build
@@ -239,8 +239,6 @@ jobs:
         shell: powershell
         env:
           BTM_GENERATE: ""
-          COMPLETION_DIR: "target/tmp/bottom/completion/"
-          MANPAGE_DIR: "target/tmp/bottom/manpage/"
         run: |
           cargo install cargo-wix --version 0.3.1 --locked
           cargo wix init
@@ -327,8 +325,6 @@ jobs:
         uses: ClementTsang/cargo-action@v0.0.3
         env:
           BTM_GENERATE: true
-          COMPLETION_DIR: "target/tmp/bottom/completion/"
-          MANPAGE_DIR: "target/tmp/bottom/manpage/"
         with:
           command: build
           args: --release --locked --verbose --features deploy --target ${{ matrix.info.target }}
@@ -349,8 +345,6 @@ jobs:
         if: matrix.info.cross == false
         env:
           BTM_GENERATE: true
-          COMPLETION_DIR: "target/tmp/bottom/completion/"
-          MANPAGE_DIR: "target/tmp/bottom/manpage/"
         run: |
           cargo install cargo-deb --version 1.38.0 --locked
           cargo deb --no-build --target ${{ matrix.info.target }}
@@ -360,8 +354,6 @@ jobs:
         if: matrix.info.cross == true
         env:
           BTM_GENERATE: true
-          COMPLETION_DIR: "target/tmp/bottom/completion/"
-          MANPAGE_DIR: "target/tmp/bottom/manpage/"
         run: |
           docker pull ${{ matrix.info.container }}
           docker run -t --rm --mount type=bind,source="$(pwd)",target=/volume ${{ matrix.info.container }} "--variant ${{ matrix.info.dpkg }} --target ${{ matrix.info.target }} --no-build" "/volume"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 735db54c..3cd3d54a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,6 +29,8 @@ env:
   CARGO_INCREMENTAL: 0
   CARGO_PROFILE_DEV_DEBUG: 0
   CARGO_HUSKY_DONT_INSTALL_HOOKS: true
+  COMPLETION_DIR: "target/tmp/bottom/completion/"
+  MANPAGE_DIR: "target/tmp/bottom/manpage/"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.ref }}