Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
f18m committed Nov 14, 2024
1 parent 2b60739 commit f64c739
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,13 @@ jobs:
- uses: actions/checkout@v4
- name: install debian-packaged dependencies
run: sudo apt install -y libgtest-dev libbenchmark-dev libfmt-dev tidy git python3 python3-dateutil python3-pip

# NOTE: prometheus-cpp & its dependencies wants at least Conan 1.51.0
- name: install pypi-packaged dependencies
run: sudo pip3 install pytest 'black==22.8.0' 'conan==1.60.2'
run: sudo pip3 install pytest 'black==22.8.0' 'conan==2.9.1'

# NOTE: since we later run "make" using the normal "builder" user, we must use Conan using that same user (so avoid the "sudo"!!)
- name: install Conan-packaged dependencies
run: |
conan profile new default --detect
conan profile update settings.compiler.libcxx=libstdc++11 default
conan install conanfile.txt --build=missing
# build & test
Expand Down
2 changes: 1 addition & 1 deletion collector/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ benchmarks:


$(OUT): $(OBJS) $(ROOT_DIR)/Constants.mk
$(CXX) $(LDFLAGS) -o $(OUT) $(OBJS) $(LIBS)
$(CXX) $(LDFLAGS) -o $(OUT) $(OBJS) -Wl,--start-group $(LIBS) -Wl,--end-group

clean:
rm -f $(OUT) $(OBJS) *.err *.json *.log
Expand Down
2 changes: 1 addition & 1 deletion collector/src/benchmarks/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ debug:
gdb $(OUT)

$(OUT): $(OBJS) $(ROOT_DIR)/Constants.mk
$(CXX) $(LDFLAGS) -o $(OUT) $(OBJS) $(LIBS)
$(CXX) $(LDFLAGS) -o $(OUT) $(OBJS) -Wl,--start-group $(LIBS) -Wl,--end-group

clean:
rm -f $(OUT) $(OBJS)
Expand Down
2 changes: 1 addition & 1 deletion collector/src/tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ accept_new_results:
done

$(OUT): $(OBJS) $(ROOT_DIR)/Constants.mk
$(CXX) $(LDFLAGS) -o $(OUT) $(OBJS) $(LIBS)
$(CXX) $(LDFLAGS) -o $(OUT) $(OBJS) -Wl,--start-group $(LIBS) -Wl,--end-group

clean:
rm -f $(OUT) $(OBJS) *.err *.json *.log
Expand Down
2 changes: 1 addition & 1 deletion conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

[requires]
prometheus-cpp/1.2.4@
prometheus-cpp/1.3.0@

[options]
# by using shared=False we create a cmonitor_collector binary that is self-contained
Expand Down

0 comments on commit f64c739

Please sign in to comment.