Skip to content

Commit 29f0cf8

Browse files
authored
fix
1 parent c60cc58 commit 29f0cf8

File tree

1 file changed

+35
-33
lines changed

1 file changed

+35
-33
lines changed

.github/workflows/build.yml

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@ on:
55
branches:
66
- msquic
77
jobs:
8-
msquic-mingw64-build:
9-
name: MsQuic MinGW64 Build
10-
runs-on: windows-2019
11-
steps:
12-
- uses: actions/checkout@v3
13-
- name: Set Mingw64 Ninja
14-
run: |
15-
(new-object System.Net.WebClient).DownloadFile('https://github.com/cristianadam/mingw-builds/releases/download/v11.2.0-rev3/x86_64-11.2.0-release-posix-seh-rt_v9-rev3.7z','mingw64.7z')
16-
7z x -aoa -oC:\ mingw64.7z
17-
rm mingw64.7z
18-
(new-object System.Net.WebClient).DownloadFile('https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip','ninja-win.zip')
19-
7z x -aoa -oC:\ninja ninja-win.zip
20-
rm ninja-win.zip
21-
cd C:\
22-
git clone --depth=1 https://github.com/microsoft/msquic.git -b v2.1.7
23-
- name: Build
24-
run: |
25-
$env:Path = "C:\mingw64\bin;C:\ninja;$env:Path"
26-
cd C:\msquic ; mkdir build ; cd build
27-
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DQUIC_BUILD_SHARED=OFF -DCMAKE_INSTALL_PREFIX=C:/MsQuic
28-
ninja
29-
ninja install
30-
- name: Package Directories
31-
run: |
32-
7z a MsQuic_MinGW64_Static.7z C:\MsQuic
33-
- uses: actions/upload-artifact@v3
34-
with:
35-
name: MsQuic_MinGW64_Static
36-
path: MsQuic_MinGW64_Static.7z
8+
# msquic-mingw64-build:
9+
# name: MsQuic MinGW64 Build
10+
# runs-on: windows-2019
11+
# steps:
12+
# - uses: actions/checkout@v3
13+
# - name: Set Mingw64 Ninja
14+
# run: |
15+
# (new-object System.Net.WebClient).DownloadFile('https://github.com/cristianadam/mingw-builds/releases/download/v11.2.0-rev3/x86_64-11.2.0-release-posix-seh-rt_v9-rev3.7z','mingw64.7z')
16+
# 7z x -aoa -oC:\ mingw64.7z
17+
# rm mingw64.7z
18+
# (new-object System.Net.WebClient).DownloadFile('https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip','ninja-win.zip')
19+
# 7z x -aoa -oC:\ninja ninja-win.zip
20+
# rm ninja-win.zip
21+
# cd C:\
22+
# git clone --depth=1 https://github.com/microsoft/msquic.git -b v2.1.7
23+
# - name: Build
24+
# run: |
25+
# $env:Path = "C:\mingw64\bin;C:\ninja;$env:Path"
26+
# cd C:\msquic ; mkdir build ; cd build
27+
# cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DQUIC_BUILD_SHARED=OFF -DCMAKE_INSTALL_PREFIX=C:/MsQuic
28+
# ninja
29+
# ninja install
30+
# - name: Package Directories
31+
# run: |
32+
# 7z a MsQuic_MinGW64_Static.7z C:\MsQuic
33+
# - uses: actions/upload-artifact@v3
34+
# with:
35+
# name: MsQuic_MinGW64_Static
36+
# path: MsQuic_MinGW64_Static.7z
3737

3838
msquic-vc143-static-build:
3939
name: MsQuic vc143 Static Build
@@ -55,12 +55,13 @@ jobs:
5555
run: |
5656
$env:Path = "C:\ninja;$env:Path"
5757
cd C:\msquic ; mkdir build ; cd build
58-
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DQUIC_BUILD_SHARED=OFF -DCMAKE_INSTALL_PREFIX=C:/MsQuic
58+
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DQUIC_BUILD_SHARED=OFF -DCMAKE_INSTALL_PREFIX=C:/msquic_install
5959
ninja
6060
ninja install
6161
- name: Package Directories
6262
run: |
63-
7z a MsQuic_VC143_Static.7z C:\MsQuic
63+
Copy-Item -Path C:\msquic\build\obj\Release -Destination 'C:\msquic_install\lib' -Recurse -Force
64+
7z a MsQuic_VC143_Static.7z C:\msquic_install
6465
- uses: actions/upload-artifact@v3
6566
with:
6667
name: MsQuic_VC143_Static
@@ -86,12 +87,13 @@ jobs:
8687
run: |
8788
$env:Path = "C:\ninja;$env:Path"
8889
cd C:\msquic ; mkdir build ; cd build
89-
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DQUIC_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=C:/MsQuic
90+
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DQUIC_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=C:/msquic_install
9091
ninja
9192
ninja install
9293
- name: Package Directories
9394
run: |
94-
7z a MsQuic_VC143_Dyn.7z C:\MsQuic
95+
Copy-Item -Path C:\msquic\build\obj\Release -Destination 'C:\msquic_install\lib' -Recurse -Force
96+
7z a MsQuic_VC143_Dyn.7z C:\msquic_install
9597
- uses: actions/upload-artifact@v3
9698
with:
9799
name: MsQuic_VC143_Dyn

0 commit comments

Comments
 (0)