[github actions] add missing tool from base image (#8271)

AlexeyAB · Dec 3, 2021 · 7fe4fb7 · 7fe4fb7
1 parent 0b2ebb7
commit 7fe4fb7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -76,7 +76,7 @@ jobs:
     - name: Update apt
       run: sudo apt update
     - name: Install dependencies
-      run: sudo apt install yasm nasm
+      run: sudo apt-get install -y yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev
 
     - name: 'Install CUDA'
       run: ${{ github.workspace }}/scripts/deploy-cuda.sh
@@ -144,7 +144,7 @@ jobs:
     - name: Update apt
       run: sudo apt update
     - name: Install dependencies
-      run: sudo apt install yasm nasm
+      run: sudo apt-get install -y yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev
 
     - name: 'Install CUDA'
       run: ${{ github.workspace }}/scripts/deploy-cuda.sh
@@ -195,7 +195,7 @@ jobs:
     - name: Update apt
       run: sudo apt update
     - name: Install dependencies
-      run: sudo apt install yasm nasm
+      run: sudo apt-get install -y yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev
 
     - name: 'Install CUDA'
       run: ${{ github.workspace }}/scripts/deploy-cuda.sh

diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml
@@ -72,7 +72,7 @@ jobs:
     - name: Update apt
       run: sudo apt update
     - name: Install dependencies
-      run: sudo apt install yasm nasm
+      run: sudo apt-get install -y yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev
 
     - name: 'Install CUDA'
       run: ${{ github.workspace }}/scripts/deploy-cuda.sh
@@ -113,7 +113,7 @@ jobs:
     - name: Update apt
       run: sudo apt update
     - name: Install dependencies
-      run: sudo apt install yasm nasm
+      run: sudo apt-get install -y yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev
 
     - name: 'Install CUDA'
       run: ${{ github.workspace }}/scripts/deploy-cuda.sh
@@ -154,7 +154,7 @@ jobs:
     - name: Update apt
       run: sudo apt update
     - name: Install dependencies
-      run: sudo apt install yasm nasm
+      run: sudo apt-get install -y yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev
 
     - name: 'Install CUDA'
       run: ${{ github.workspace }}/scripts/deploy-cuda.sh

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -38,6 +38,7 @@ mkdir -p $temp_folder
 cd $temp_folder
 
 if [ -f $script_dir/requested_cuda_version.sh ]; then
+  echo "Loading $script_dir/requested_cuda_version.sh"
   source $script_dir/requested_cuda_version.sh
 else
   echo "Unable to find requested_cuda_version.sh script"
@@ -54,7 +55,11 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     exit 3
   fi
 elif [[ $(cut -f2 <<< $(lsb_release -i)) == "Ubuntu" ]]; then
+  echo "Running in $(cut -f2 <<< $(lsb_release -i))"
+  echo "InstallCUDA: $install_cuda"
+  echo "InstallTOOLS: $install_tools"
   if [ "$install_cuda" = true ] ; then
+    echo "Running $script_dir/deploy-cuda.sh"
     $script_dir/deploy-cuda.sh
     if [ "$bypass_driver_installation" = true ] ; then
       sudo ln -s /usr/local/cuda-${CUDA_VERSION}/lib64/stubs/libcuda.so /usr/local/cuda-${CUDA_VERSION}/lib64/stubs/libcuda.so.1
@@ -68,9 +73,11 @@ elif [[ $(cut -f2 <<< $(lsb_release -i)) == "Ubuntu" ]]; then
     export CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda
   fi
   if [ "$install_tools" = true ] ; then
+    echo "Installing tools"
     sudo apt-get update
-    sudo apt-get install -y git ninja-build build-essential g++ nasm yasm
+    sudo apt-get install -y git ninja-build build-essential g++ nasm yasm gperf
     sudo apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget
+    sudo apt-get install -y libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev
     wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
     sudo apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(cut -f2 <<< $(lsb_release -c)) main"
     wget -q https://packages.microsoft.com/config/ubuntu/$(cut -f2 <<< $(lsb_release -r))/packages-microsoft-prod.deb
@@ -80,6 +87,8 @@ elif [[ $(cut -f2 <<< $(lsb_release -i)) == "Ubuntu" ]]; then
     sudo apt-get dist-upgrade -y
     sudo apt-get install -y cmake
     sudo apt-get install -y powershell
+    sudo apt-get install -y curl zip unzip tar
+    sudo apt-get install -y pkg-config autoconf libtool bison
   fi
 else
   if [ "$install_cuda" = true ] ; then
@@ -94,7 +103,7 @@ fi
 
 cd ..
 rm -rf "$temp_folder"
-
+echo "Building darknet"
 if [[ -v CUDA_PATH ]]; then
   ./build.ps1 -UseVCPKG -EnableOPENCV -EnableCUDA -EnableCUDNN -DisableInteractive -DoNotUpdateDARKNET
   #./build.ps1 -UseVCPKG -EnableOPENCV -EnableCUDA -EnableCUDNN -EnableOPENCV_CUDA -DisableInteractive -DoNotUpdateDARKNET