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

Commit be5e37f

Browse files
sangjanaisangjanai
committed
fix: windows
1 parent df5d498 commit be5e37f

File tree

2 files changed

+63
-38
lines changed

2 files changed

+63
-38
lines changed

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

Lines changed: 62 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,59 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- os: "linux"
25-
name: "arm64"
26-
runs-on: "ubuntu-2004-arm64"
27-
cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON"
28-
build-deps-cmake-flags: ""
29-
ccache-dir: ""
30-
- os: "linux"
31-
name: "amd64"
32-
runs-on: "ubuntu-20-04-cuda-12-0"
33-
cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON"
34-
build-deps-cmake-flags: ""
35-
ccache-dir: ""
36-
- os: "mac"
37-
name: "amd64"
38-
runs-on: "macos-selfhosted-12"
39-
cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON"
40-
build-deps-cmake-flags: ""
41-
ccache-dir: ""
42-
- os: "mac"
43-
name: "arm64"
44-
runs-on: "macos-selfhosted-12-arm64"
45-
cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DMAC_ARM64=ON"
46-
build-deps-cmake-flags: ""
47-
ccache-dir: ""
24+
# - os: "linux"
25+
# name: "arm64"
26+
# runs-on: "ubuntu-2004-arm64"
27+
# cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON"
28+
# build-deps-cmake-flags: ""
29+
# ccache-dir: ""
30+
# - os: "linux"
31+
# name: "amd64"
32+
# runs-on: "ubuntu-20-04-cuda-12-0"
33+
# cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON"
34+
# build-deps-cmake-flags: ""
35+
# ccache-dir: ""
36+
# - os: "mac"
37+
# name: "amd64"
38+
# runs-on: "macos-selfhosted-12"
39+
# cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON"
40+
# build-deps-cmake-flags: ""
41+
# ccache-dir: ""
42+
# - os: "mac"
43+
# name: "arm64"
44+
# runs-on: "macos-selfhosted-12-arm64"
45+
# cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DMAC_ARM64=ON"
46+
# build-deps-cmake-flags: ""
47+
# ccache-dir: ""
4848
- os: "windows"
4949
name: "amd64"
50-
runs-on: "windows-cuda-12-0"
50+
runs-on: "windows-2019"
5151
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"
5252
build-deps-cmake-flags: "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
53-
ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
53+
ccache-dir: ""
5454
steps:
55+
# - name: Set Perl environment variables
56+
# if: runner.os == 'Windows'
57+
# run: |
58+
# echo "PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
59+
# echo "OPENSSL_SRC_PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
60+
# perl -MCPAN -e "install Locale::Maketext::Simple"
61+
# - name: Setup Perl
62+
# if: runner.os == 'Windows'
63+
# uses: shogo82148/actions-setup-perl@v1
64+
# with:
65+
# perl-version: "5.38"
66+
# distribution: strawberry
67+
# - name: perl -V
68+
# run: perl -V
69+
# - name: Ensure we have a working toolchain
70+
# run: cpanm ExtUtils::Manifest App::cpanminus
71+
# - name: Install Dependencies
72+
# run: cpanm -n --installdeps .
73+
# - name: Run Tests
74+
# run: cpanm --test-only -v .
75+
76+
5577
- name: Clone
5678
id: checkout
5779
uses: actions/checkout@v3
@@ -74,18 +96,18 @@ jobs:
7496
run: |
7597
choco install make pkgconfiglite ccache awscli 7zip ninja -y
7698
77-
- name: Download ccache from s3
78-
if: runner.os == 'Windows'
79-
continue-on-error: true
80-
run: |
81-
Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
82-
refreshenv
83-
aws s3 sync s3://${{ secrets.MINIO_BUCKET_NAME }}/cortex-cpp-${{ matrix.os }}-${{ matrix.name }} ${{ matrix.ccache-dir }} --endpoint ${{ secrets.MINIO_ENDPOINT }}
84-
aws s3 sync s3://${{ secrets.MINIO_BUCKET_NAME }}/cortex-cpp-vcpkg-windows C:\Users\ContainerAdministrator\AppData\Local\vcpkg --endpoint ${{ secrets.MINIO_ENDPOINT }}
85-
env:
86-
AWS_ACCESS_KEY_ID: "${{ secrets.MINIO_ACCESS_KEY_ID }}"
87-
AWS_SECRET_ACCESS_KEY: "${{ secrets.MINIO_SECRET_ACCESS_KEY }}"
88-
AWS_DEFAULT_REGION: "${{ secrets.MINIO_REGION }}"
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 }}"
89111

90112
- name: Download vcpkg cache from s3
91113
if: runner.os == 'Linux'
@@ -100,6 +122,8 @@ jobs:
100122
- name: Build
101123
if: runner.os != 'Linux'
102124
run: |
125+
echo "PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
126+
echo "OPENSSL_SRC_PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
103127
cd engine
104128
make build CMAKE_EXTRA_FLAGS="${{ matrix.cmake-flags }}" BUILD_DEPS_CMAKE_EXTRA_FLAGS="${{ matrix.build-deps-cmake-flags }}"
105129

‎engine/cmake/openssl.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
2424
set(OPENSSL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/config)
2525
if(MSVC)
2626
ExternalProject_Add(
27+
OpenSSL
2728
SOURCE_DIR ${OPENSSL_SOURCE_DIR}
2829
GIT_REPOSITORY https://github.com/openssl/openssl.git
2930
GIT_TAG openssl-3.4.1

0 commit comments

Comments
 (0)