Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

Commit 56a74e5

Browse files
committed
chore: use self-hosted
1 parent 0761418 commit 56a74e5

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

.github/workflows/cortex-cpp-quality-gate.yml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,13 @@ jobs:
4747
# ccache-dir: ""
4848
- os: "windows"
4949
name: "amd64"
50-
runs-on: "windows-2019"
50+
runs-on: "windows-cuda-12-0"
51+
# runs-on: "windows-2019"
5152
cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
5253
build-deps-cmake-flags: "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
53-
ccache-dir: ""
54+
# ccache-dir: ""
55+
ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
56+
5457
steps:
5558
# - name: Set Perl environment variables
5659
# if: runner.os == 'Windows'
@@ -96,18 +99,18 @@ jobs:
9699
run: |
97100
choco install make pkgconfiglite ccache awscli 7zip ninja -y
98101
99-
# - name: Download ccache from s3
100-
# if: runner.os == 'Windows'
101-
# continue-on-error: true
102-
# run: |
103-
# Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
104-
# refreshenv
105-
# aws s3 sync s3://${{ secrets.MINIO_BUCKET_NAME }}/cortex-cpp-${{ matrix.os }}-${{ matrix.name }} ${{ matrix.ccache-dir }} --endpoint ${{ secrets.MINIO_ENDPOINT }}
106-
# aws s3 sync s3://${{ secrets.MINIO_BUCKET_NAME }}/cortex-cpp-vcpkg-windows C:\Users\ContainerAdministrator\AppData\Local\vcpkg --endpoint ${{ secrets.MINIO_ENDPOINT }}
107-
# env:
108-
# AWS_ACCESS_KEY_ID: "${{ secrets.MINIO_ACCESS_KEY_ID }}"
109-
# AWS_SECRET_ACCESS_KEY: "${{ secrets.MINIO_SECRET_ACCESS_KEY }}"
110-
# AWS_DEFAULT_REGION: "${{ secrets.MINIO_REGION }}"
102+
- name: Download ccache from s3
103+
if: runner.os == 'Windows'
104+
continue-on-error: true
105+
run: |
106+
Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
107+
refreshenv
108+
aws s3 sync s3://${{ secrets.MINIO_BUCKET_NAME }}/cortex-cpp-${{ matrix.os }}-${{ matrix.name }} ${{ matrix.ccache-dir }} --endpoint ${{ secrets.MINIO_ENDPOINT }}
109+
aws s3 sync s3://${{ secrets.MINIO_BUCKET_NAME }}/cortex-cpp-vcpkg-windows C:\Users\ContainerAdministrator\AppData\Local\vcpkg --endpoint ${{ secrets.MINIO_ENDPOINT }}
110+
env:
111+
AWS_ACCESS_KEY_ID: "${{ secrets.MINIO_ACCESS_KEY_ID }}"
112+
AWS_SECRET_ACCESS_KEY: "${{ secrets.MINIO_SECRET_ACCESS_KEY }}"
113+
AWS_DEFAULT_REGION: "${{ secrets.MINIO_REGION }}"
111114

112115
- name: Download vcpkg cache from s3
113116
if: runner.os == 'Linux'
@@ -127,7 +130,11 @@ jobs:
127130
cd engine
128131
cmake -S ./third-party -B ./build_deps
129132
cmake --build ./build_deps --config Release -j4
130-
make build CMAKE_EXTRA_FLAGS="${{ matrix.cmake-flags }}" BUILD_DEPS_CMAKE_EXTRA_FLAGS="${{ matrix.build-deps-cmake-flags }}"
133+
# make build CMAKE_EXTRA_FLAGS="${{ matrix.cmake-flags }}" BUILD_DEPS_CMAKE_EXTRA_FLAGS="${{ matrix.build-deps-cmake-flags }}"
134+
mkdir -p build
135+
cd build
136+
cmake .. ${{ matrix.cmake-flags }}
137+
cmake --build . --config Release -j4
131138
132139
- name: Build
133140
if: runner.os == 'Linux'

engine/cmake/drogon.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif()
1414

1515
set(ZLIB_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/zlib/install)
1616
set(ZLIB_INCLUDE_DIR ${ZLIB_INSTALL_DIR}/include)
17-
if(MSVC)
17+
if(WIN32)
1818
set(ZLIB_LIBRARY ${ZLIB_INSTALL_DIR}/lib/zlib.lib)
1919
elseif(APPLE)
2020
set(ZLIB_LIBRARY ${ZLIB_INSTALL_DIR}/lib/libz.dylib)
@@ -24,7 +24,7 @@ endif()
2424

2525

2626
set(JSONCPP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/jsoncpp-lib)
27-
if(MSVC)
27+
if(WIN32)
2828
set(JSONCPP_LIBRARIES ${JSONCPP_INSTALL_DIR}/lib/jsoncpp.lib)
2929
elseif(APPLE)
3030
set(JSONCPP_LIBRARIES ${JSONCPP_INSTALL_DIR}/lib/libjsoncpp.dylib)
@@ -34,7 +34,7 @@ endif()
3434
set(JSONCPP_INCLUDE_DIRS ${JSONCPP_INSTALL_DIR}/include)
3535

3636
set(C-ARES_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/c-ares-lib)
37-
if(MSVC)
37+
if(WIN32)
3838
set(ARES_LIBRARIES ${ARES_INSTALL_DIR}/lib/cares.lib)
3939
elseif(APPLE)
4040
set(ARES_LIBRARIES ${ARES_INSTALL_DIR}/lib/libcares.dylib)

0 commit comments

Comments
 (0)