Skip to content

Commit ded94fc

Browse files
committed
Fix windows build
1 parent 8e2bc07 commit ded94fc

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

.github/workflows/test.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
runs-on: windows-2022
4646
timeout-minutes: 30
4747
env:
48+
CMAKE_GENERATOR: Ninja
4849
POETRY_VIRTUALENVS_IN_PROJECT: "true"
4950
steps:
5051
- uses: actions/checkout@v6
@@ -79,11 +80,16 @@ jobs:
7980
run: |
8081
choco install make --no-progress --yes
8182
python -m pip install "conan==2.31.1" "poetry==2.4.1"
82-
- name: Build
83+
- name: Build tgbot-cpp
8384
shell: bash
8485
env:
8586
CONAN_BUILD_ARGS: --build=missing -s compiler.cppstd=20 -c tools.cmake.cmaketoolchain:generator=Ninja
86-
run: make build-with-test
87+
run: |
88+
make build-with-test
89+
make install-only
90+
- name: Build examples
91+
shell: bash
92+
run: make examples
8793
- name: Test tgbot-cpp
8894
shell: bash
8995
run: make test-only

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ DOCS_WORKTREE := $(abspath build/gh-pages)
4444
lint \
4545
lint-cpp \
4646
lint-python \
47+
lint-ci \
4748
docker-image \
4849
docker-test-image \
4950
docker-test \
@@ -137,7 +138,7 @@ install-with-system: build-with-system
137138
$(MAKE) install-only
138139

139140
install-only:
140-
cmake --install $(BUILD_DIR) $(if $(INSTALL_PREFIX),--prefix $(INSTALL_PREFIX),)
141+
cmake --install $(BUILD_DIR) $(if $(INSTALL_PREFIX),--prefix $(abspath $(INSTALL_PREFIX)),)
141142

142143
api-update: dependencies-python
143144
poetry run python -m api_codegen.main update
@@ -164,6 +165,9 @@ lint-python:
164165
poetry run ruff check $(PYTHON_FILES)
165166
poetry run ruff format --check $(PYTHON_FILES)
166167

168+
lint-ci:
169+
go run github.com/rhysd/actionlint/cmd/actionlint@v1.7.12
170+
167171
docker-image:
168172
docker build --platform=$(DOCKER_PLATFORM) -t $(DOCKER_IMAGE) -f Dockerfile .
169173

0 commit comments

Comments
 (0)