TEST

man-group · Dec 2, 2024 · 52f1860 · 52f1860
1 parent 6767d75
commit 52f1860
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/.github/workflows/analysis_workflow.yml b/.github/workflows/analysis_workflow.yml
@@ -126,13 +126,16 @@ jobs:
         id: cpu-cores
 
       - name: Install deps
+        shell: bash -l {0} 
         run: |
           dnf update -y
           dnf remove -y 'gcc-toolset-13-*'
           dnf install -y zip flex bison gcc-toolset-10 gcc-toolset-10-gdb gcc-toolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \
           unzip tar epel-release jq wget libcurl-devel python3 \
           python3-devel python3-pip perl-IPC-Cmd
 
+          dnf groupinstall -y 'Development Tools'
+
           echo "CC=/opt/rh/gcc-toolset-10/root/bin/gcc" | tee -a $GITHUB_ENV
           echo "CMAKE_C_COMPILER=/opt/rh/gcc-toolset-10/root/bin/gcc" | tee -a $GITHUB_ENV
           echo "CXX=/opt/rh/gcc-toolset-10/root/bin/g++" | tee -a $GITHUB_ENV
@@ -158,7 +161,11 @@ jobs:
           cp /tmp/sccache-*/sccache /usr/local/bin/
           rm /tmp/sccache.tar.gz
 
+          which gcc
+          which g++
+
       - name: Extra envs
+        shell: bash -l {0}
         run: |
           . build_tooling/vcpkg_caching.sh # Linux follower needs another call in CIBW
           echo -e "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES

diff --git a/.github/workflows/benchmark_commits.yml b/.github/workflows/benchmark_commits.yml
@@ -52,6 +52,8 @@ jobs:
           unzip tar epel-release jq wget libcurl-devel python3 \
           python3-devel python3-pip perl-IPC-Cmd
 
+          dnf groupinstall -y 'Development Tools'
+
           echo "CC=/opt/rh/gcc-toolset-10/root/bin/gcc" | tee -a $GITHUB_ENV
           echo "CMAKE_C_COMPILER=/opt/rh/gcc-toolset-10/root/bin/gcc" | tee -a $GITHUB_ENV
           echo "CXX=/opt/rh/gcc-toolset-10/root/bin/g++" | tee -a $GITHUB_ENV
@@ -67,6 +69,19 @@ jobs:
 
           dnf clean all
 
+          # sccache
+          sccache_ver=`curl -sL -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/mozilla/sccache/releases/latest | jq -r ".tag_name"`
+          
+          wget -nv https://github.com/mozilla/sccache/releases/download/$sccache_ver/sccache-$sccache_ver-x86_64-unknown-linux-musl.tar.gz \
+            -O /tmp/sccache.tar.gz
+          tar -xvf /tmp/sccache.tar.gz -C /tmp/
+          cp /tmp/sccache-*/sccache /usr/local/bin/
+          rm /tmp/sccache.tar.gz
+
+          which gcc
+          which g++
+
       # We are changing the python here because we want to use the default python to build (it is devel version)
       # and this python for the rest of the testing
       - name: Select Python (Linux)

diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml
@@ -97,6 +97,8 @@ jobs:
           unzip tar epel-release jq wget libcurl-devel python3 \
           python3-devel python3-pip perl-IPC-Cmd
 
+          dnf groupinstall -y 'Development Tools'
+
           echo "CC=/opt/rh/gcc-toolset-10/root/bin/gcc" | tee -a $GITHUB_ENV
           echo "CMAKE_C_COMPILER=/opt/rh/gcc-toolset-10/root/bin/gcc" | tee -a $GITHUB_ENV
           echo "CXX=/opt/rh/gcc-toolset-10/root/bin/g++" | tee -a $GITHUB_ENV
@@ -121,6 +123,9 @@ jobs:
           tar -xvf /tmp/sccache.tar.gz -C /tmp/
           cp /tmp/sccache-*/sccache /usr/local/bin/
           rm /tmp/sccache.tar.gz
+
+          which gcc
+          which g++
           
       - name: Extra envs
         # This has to come after msvc-dev-cmd to overwrite the bad VCPKG_ROOT it sets