github-ci: add .cargo/bin to path on cbindgen install

And remove cbindgen from builds that use the distribution
archive.

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 2eb64f9287161a686ddf0476198a1b5ac8b58fd6..5ed55fee381b5a6678f4ffa9dedccc3acf7b6509 100644 (file)
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -72,6 +72,7 @@ jobs:
                 texlive-needspace \
       - name: Install cbindgen
         run: cargo install --force cbindgen
+      - run: echo "::add-path::$HOME/.cargo/bin"
       - uses: actions/checkout@v1
       - name: Bundling libhtp
         run: git clone https://github.com/OISF/libhtp -b 0.5.x
@@ -141,8 +142,6 @@ jobs:
                 sudo \
                 which \
                 zlib-devel
-      - name: Install cbindgen
-        run: cargo install --force cbindgen
       - name: Download suricata.tar.gz
         uses: actions/download-artifact@v1
         with:
@@ -162,7 +161,7 @@ jobs:
     steps:
       - name: Install Rust
         run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.33.0 -y
-      - run: echo "::add-path::/github/home/.cargo/bin"
+      - run: echo "::add-path::$HOME/.cargo/bin"
       - name: Install system dependencies
         run: |
           yum -y install epel-release
@@ -181,8 +180,6 @@ jobs:
                 sudo \
                 which \
                 zlib-devel
-      - name: Install cbindgen
-        run: cargo install --force cbindgen
       - name: Download suricata.tar.gz
         uses: actions/download-artifact@v1
         with:
@@ -249,6 +246,7 @@ jobs:
                 zlib-devel
       - name: Install cbindgen
         run: cargo install --force cbindgen
+      - run: echo "::add-path::$HOME/.cargo/bin"
       - uses: actions/checkout@v1
       - run: git clone https://github.com/OISF/libhtp -b 0.5.x
       - run: ./autogen.sh
@@ -316,6 +314,7 @@ jobs:
           apt -y install coccinelle
       - name: Install cbindgen
         run: cargo install --force cbindgen
+      - run: echo "::add-path::$HOME/.cargo/bin"
       - uses: actions/checkout@v1
       - run: git clone https://github.com/OISF/libhtp -b 0.5.x
       - run: ./autogen.sh
@@ -366,9 +365,7 @@ jobs:
                 zlib1g-dev
       - name: Install Rust
         run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.33.0 -y
-      - run: echo "::add-path::/github/home/.cargo/bin"
-      - name: Install cbindgen
-        run: cargo install --force cbindgen
+      - run: echo "::add-path::$HOME/.cargo/bin"
       - name: Download suricata.tar.gz
         uses: actions/download-artifact@v1
         with:
@@ -443,6 +440,7 @@ jobs:
                 zlib1g-dev
       - name: Install cbindgen
         run: cargo install --force cbindgen
+      - run: echo "::add-path::$HOME/.cargo/bin"
       - uses: actions/checkout@v1
       - name: Bundling libhtp
         run: git clone https://github.com/OISF/libhtp -b 0.5.x
@@ -503,7 +501,7 @@ jobs:
                 zlib1g-dev
       - name: Install Rust
         run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.33.0 -y
-      - run: echo "::add-path::/github/home/.cargo/bin"
+      - run: echo "::add-path::$HOME/.cargo/bin"
       - name: Install cbindgen
         run: cargo install --force cbindgen
       - uses: actions/checkout@v1
@@ -555,6 +553,7 @@ jobs:
           xz
       - name: Install cbindgen
         run: cargo install --force cbindgen
+      - run: echo "::add-path::$HOME/.cargo/bin"
       - run: pip install PyYAML
       - uses: actions/checkout@v1
       - run: git clone https://github.com/OISF/libhtp -b 0.5.x