@@ -29,21 +29,26 @@ jobs:
2929 arch : darwin-amd64
3030 artifacts : " plc"
3131 RUSTFLAGS : " "
32+ libvm : " libvm.a"
3233 - os : " self-hosted"
3334 dir : osx64
3435 arch : darwin-arm64
3536 artifacts : " plc"
3637 RUSTFLAGS : " "
38+ libvm : " libvm.a"
3739 - os : " ubuntu-latest"
3840 dir : linux64
3941 debdir : pivot-lang_0.1.0-1_amd64
4042 artifacts : " plc"
4143 arch : linux-amd64
4244 RUSTFLAGS : " "
43- # - os: "windows-latest"
44- # dir: win64
45- # artifacts: "plc.exe"
46- # RUSTFLAGS: "-Dwarnings -Ctarget-feature=+crt-static"
45+ libvm : " libvm.a"
46+ - os : " windows-latest"
47+ dir : win64
48+ artifacts : " plc.exe"
49+ RUSTFLAGS : " -Dwarnings -Ctarget-feature=+crt-static"
50+ libvm : " vm.lib"
51+ arch : windows-amd64
4752 steps :
4853 - uses : actions/checkout@v3
4954 with :
@@ -70,43 +75,17 @@ jobs:
7075 - name : Install LLVM
7176 uses : Pivot-Studio/setup-llvm@main
7277
73- - name : set up win scoop
74- if : ${{ matrix.config.os == 'windows-latest' }}
75- uses : MinoruSekine/setup-scoop@main
76-
77- - name : Install LLVM and Clang win
78- if : ${{ matrix.config.os == 'windows-latest' }}
79- run : |
80- scoop install 7zip
81- scoop install wget
82- wget https://github.com/Pivot-Studio/pivot-lang/releases/download/llvm-windows-latest/llvm-14.0.6-windows-x64-msvc17.7z
83- 7z x .\llvm-14.0.6-windows-x64-msvc17.7z -y -o${{ runner.temp }}\llvm
84- [Environment]::SetEnvironmentVariable(
85- "Path",
86- [Environment]::GetEnvironmentVariable("Path", "User") + ";${{ runner.temp }}\llvm\bin",
87- "User"
88- )
89- [Environment]::SetEnvironmentVariable('LLVM_SYS_140_PREFIX', '${{ runner.temp }}\llvm', 'User')
78+ # - name: set up win scoop
79+ # if: ${{ matrix.config.os == 'windows-latest' }}
80+ # uses: MinoruSekine/setup-scoop@main
9081
91- - uses : ilammy/msvc-dev-cmd@v1
92- if : ${{ matrix.config.os == 'windows-latest' }}
93- with :
94- arch : x64
95- vs_version : 2022
96- - name : Cargo build win
97- if : ${{ matrix.config.os == 'windows-latest' }}
98- env :
99- RUSTFLAGS : ${{ matrix.config.RUSTFLAGS }}
100- run : cargo build --release --verbose
10182
10283 - name : Cargo build
103- if : ${{ matrix.config.os != 'windows-latest' }}
10484 env :
10585 RUSTFLAGS : ${{ matrix.config.RUSTFLAGS }}
10686 run : cargo build --release
10787
10888 - name : Cargo build vm
109- if : ${{ matrix.config.os != 'windows-latest' }}
11089 env :
11190 RUSTFLAGS : ${{ matrix.config.RUSTFLAGS }}
11291 run : cd vm && cargo build --release
@@ -130,7 +109,7 @@ jobs:
130109
131110 - name : Move libvm
132111 env :
133- ARTIFACTS : libvm.a
112+ ARTIFACTS : ${{ matrix.config.libvm }}
134113 OUT_DIR : ${{ matrix.config.dir }}
135114 OS : ${{ matrix.config.os }}
136115 run : |
@@ -225,7 +204,6 @@ jobs:
225204 github_repository : Pivot-Studio/apt-repo
226205
227206 - name : tar artifacts
228- if : ${{ matrix.config.os != 'windows-latest' }}
229207 env :
230208 OUT_DIR : ${{ matrix.config.dir }}
231209 OS : ${{ matrix.config.os }}
0 commit comments