Skip to content

Commit eca0dc6

Browse files
authored
Update CI
1 parent 8e0d578 commit eca0dc6

4 files changed

+15
-29
lines changed

.github/workflows/windows-llvm-msvc-build-PDB.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,17 @@ jobs:
3535
-DLLVM_ENABLE_ZLIB=OFF `
3636
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
3737
-DLLVM_USE_CRT_RELEASE=MT `
38-
-DCPACK_GENERATOR=ZIP `
39-
-DCMAKE_INSTALL_PREFIX="$pwd\\prefix" `
38+
-DCMAKE_INSTALL_PREFIX=install `
4039
-DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64;RISCV" `
4140
-DLLVM_ENABLE_PROJECTS="clang;lld;lldb" `
4241
llvm-msvc\\llvm
4342
cmake --build build --config ${{ env.BUILD_TYPE }}
44-
43+
cmake --build build --config ${{ env.BUILD_TYPE }} --target install
44+
4545
- name: Package llvm
4646
run: |
47-
cmake --build build --target package --config ${{ env.BUILD_TYPE }}
48-
49-
- name: Archive
50-
run:
51-
7z a -v1500m windows-llvm-msvc-PDB.zip build/*.zip
52-
47+
7z a -v1500m windows-llvm-msvc-PDB.zip install
48+
5349
- name: Upload Artifact
5450
uses: actions/upload-artifact@v2
5551
with:

.github/workflows/windows-llvm-msvc-build.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,16 @@ jobs:
3434
-DLLVM_ENABLE_ZLIB=OFF `
3535
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
3636
-DLLVM_USE_CRT_RELEASE=MT `
37-
-DCPACK_GENERATOR=ZIP `
38-
-DCMAKE_INSTALL_PREFIX="$pwd\\prefix" `
37+
-DCMAKE_INSTALL_PREFIX=install `
3938
-DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64;RISCV" `
4039
-DLLVM_ENABLE_PROJECTS="clang;lld;lldb" `
4140
llvm-msvc\\llvm
4241
cmake --build build --config ${{ env.BUILD_TYPE }}
43-
42+
cmake --build build --config ${{ env.BUILD_TYPE }} --target install
43+
4444
- name: Package llvm
4545
run: |
46-
cmake --build build --target package --config ${{ env.BUILD_TYPE }}
47-
48-
- name: Archive
49-
run:
50-
7z a -v1500m windows-llvm-msvc.zip build/*.zip
46+
7z a -v1500m windows-llvm-msvc.zip install
5147
5248
- name: Upload Artifact
5349
uses: actions/upload-artifact@v2

.github/workflows/windows-wrapper-llvm-msvc-build-PDB.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,16 @@ jobs:
3636
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
3737
-DLLVM_USE_CRT_RELEASE=MT `
3838
-DCPACK_GENERATOR=ZIP `
39-
-DCMAKE_INSTALL_PREFIX="$pwd\\prefix" `
39+
-DCMAKE_INSTALL_PREFIX=install `
4040
-DLLVM_TARGETS_TO_BUILD="X86;AArch64" `
4141
-DLLVM_ENABLE_PROJECTS="clang;lld" `
4242
llvm-msvc\\llvm
4343
cmake --build build --config ${{ env.BUILD_TYPE }}
44+
cmake --build build --config ${{ env.BUILD_TYPE }} --target install
4445
4546
- name: Package llvm
4647
run: |
47-
cmake --build build --target package --config ${{ env.BUILD_TYPE }}
48-
49-
- name: Archive
50-
run:
51-
7z a -v1500m windows-wrapper-llvm-msvc-PDB.zip build/*.zip
48+
7z a -v1500m windows-wrapper-llvm-msvc-PDB.zip install
5249
5350
- name: Upload Artifact
5451
uses: actions/upload-artifact@v2

.github/workflows/windows-wrapper-llvm-msvc-build.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,16 @@ jobs:
3535
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
3636
-DLLVM_USE_CRT_RELEASE=MT `
3737
-DCPACK_GENERATOR=ZIP `
38-
-DCMAKE_INSTALL_PREFIX="$pwd\\prefix" `
38+
-DCMAKE_INSTALL_PREFIX=install `
3939
-DLLVM_TARGETS_TO_BUILD="X86;AArch64" `
4040
-DLLVM_ENABLE_PROJECTS="clang;lld" `
4141
llvm-msvc\\llvm
4242
cmake --build build --config ${{ env.BUILD_TYPE }}
43+
cmake --build build --config ${{ env.BUILD_TYPE }} --target install
4344
4445
- name: Package llvm
4546
run: |
46-
cmake --build build --target package --config ${{ env.BUILD_TYPE }}
47-
48-
- name: Archive
49-
run:
50-
7z a -v1500m windows-wrapper-llvm-msvc.zip build/*.zip
47+
7z a -v1500m windows-wrapper-llvm-msvc.zip install
5148
5249
- name: Upload Artifact
5350
uses: actions/upload-artifact@v2

0 commit comments

Comments
 (0)