fixed gtest on azurelinux-3

Azure · Feb 14, 2025 · fbf9f77 · fbf9f77
1 parent b197515
commit fbf9f77
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
@@ -5,8 +5,8 @@ on:
     paths:
       - devops/docker/**/Dockerfile
   push:
-    branches:
-      - dev
+    # branches:
+    #   - dev
     paths:
       - devops/docker/**/Dockerfile
   workflow_dispatch:
@@ -113,6 +113,7 @@ jobs:
         with:
           context: ${{ steps.image.outputs.path }}
           # Only push the image when a pull request is merged to dev
-          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' }}
+          # push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/devops/docker/azurelinux-3-amd64/Dockerfile b/devops/docker/azurelinux-3-amd64/Dockerfile
@@ -10,8 +10,6 @@ RUN tdnf install -y \
     file \
     gcovr \
     git \
-    gmock-devel \
-    gtest-devel \
     jq \
     ninja-build \
     openssl-devel \
@@ -22,7 +20,12 @@ RUN tdnf install -y \
     tree \
     unzip \
     util-linux \
+    uuid-devel \
     wget \
     zip && \
     tdnf upgrade -y && \
-    tdnf clean all
+    tdnf clean all
+
+# GTest
+RUN git clone https://github.com/google/googletest --recursive -b release-1.12.0
+RUN cd googletest && cmake . && cmake --build . --parallel --target install && rm -rf /git/googletest