Skip to content

Commit fbf9f77

Browse files
committed
fixed gtest on azurelinux-3
1 parent b197515 commit fbf9f77

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/workflows/build-containers.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
paths:
66
- devops/docker/**/Dockerfile
77
push:
8-
branches:
9-
- dev
8+
# branches:
9+
# - dev
1010
paths:
1111
- devops/docker/**/Dockerfile
1212
workflow_dispatch:
@@ -113,6 +113,7 @@ jobs:
113113
with:
114114
context: ${{ steps.image.outputs.path }}
115115
# Only push the image when a pull request is merged to dev
116-
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' }}
116+
# push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' }}
117+
push: true
117118
tags: ${{ steps.meta.outputs.tags }}
118119
labels: ${{ steps.meta.outputs.labels }}

devops/docker/azurelinux-3-amd64/Dockerfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ RUN tdnf install -y \
1010
file \
1111
gcovr \
1212
git \
13-
gmock-devel \
14-
gtest-devel \
1513
jq \
1614
ninja-build \
1715
openssl-devel \
@@ -22,7 +20,12 @@ RUN tdnf install -y \
2220
tree \
2321
unzip \
2422
util-linux \
23+
uuid-devel \
2524
wget \
2625
zip && \
2726
tdnf upgrade -y && \
28-
tdnf clean all
27+
tdnf clean all
28+
29+
# GTest
30+
RUN git clone https://github.com/google/googletest --recursive -b release-1.12.0
31+
RUN cd googletest && cmake . && cmake --build . --parallel --target install && rm -rf /git/googletest

0 commit comments

Comments
 (0)