Skip to content

Commit 8f0b348

Browse files
committed
fix: statically link the dll
1 parent 4f47322 commit 8f0b348

2 files changed

Lines changed: 7 additions & 21 deletions

File tree

.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[build]
2+
rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/build.yaml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: windows-latest
4040
strategy:
4141
matrix:
42-
target: [i686-pc-windows-gnu, x86_64-pc-windows-gnu]
42+
target: [i686-pc-windows-msvc, x86_64-pc-windows-msvc]
4343

4444
steps:
4545
- name: Checkout source
@@ -51,22 +51,6 @@ jobs:
5151
target: ${{ matrix.target }}
5252
override: true
5353

54-
- name: Install MSYS2 and MinGW-w64
55-
uses: msys2/setup-msys2@v2
56-
with:
57-
update: true
58-
install: ${{ matrix.target == 'i686-pc-windows-gnu' && 'mingw-w64-i686-gcc' || 'mingw-w64-x86_64-gcc' }}
59-
60-
- name: Add MinGW to PATH
61-
run: |
62-
if ("${{ matrix.target }}" -eq "i686-pc-windows-gnu") {
63-
echo "C:\\msys64\\mingw32\\bin" >> $env:GITHUB_PATH
64-
rustup update
65-
} else {
66-
echo "C:\\msys64\\mingw64\\bin" >> $env:GITHUB_PATH
67-
}
68-
shell: pwsh
69-
7054
- name: Build for ${{ matrix.target }}
7155
run: cargo build --release --target=${{ matrix.target }}
7256

@@ -75,7 +59,7 @@ jobs:
7559
$target = "${{ matrix.target }}"
7660
$original = "target\$target\release\$env:PROJECT_NAME.dll"
7761
78-
if ($target -eq "i686-pc-windows-gnu") {
62+
if ($target -eq "i686-pc-windows-msvc") {
7963
$renamed = "target\$target\release\$env:NAME_WIN32"
8064
} else {
8165
$renamed = "target\$target\release\$env:NAME_WIN64"
@@ -95,7 +79,7 @@ jobs:
9579
with:
9680
name: ${{ matrix.target }}-dll
9781
path: |
98-
target/${{ matrix.target }}/release/${{ matrix.target == 'i686-pc-windows-gnu' && env.NAME_WIN32 || env.NAME_WIN64 }}
82+
target/${{ matrix.target }}/release/${{ matrix.target == 'i686-pc-windows-msvc' && env.NAME_WIN32 || env.NAME_WIN64 }}
9983
10084
version:
10185
needs: build
@@ -137,7 +121,7 @@ jobs:
137121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
138122
run: |
139123
gh release create ${{ env.TAG_NAME }} \
140-
artifacts/i686-pc-windows-gnu-dll/${{ env.NAME_WIN32 }} \
141-
artifacts/x86_64-pc-windows-gnu-dll/${{ env.NAME_WIN64 }} \
124+
artifacts/i686-pc-windows-msvc-dll/${{ env.NAME_WIN32 }} \
125+
artifacts/x86_64-pc-windows-msvc-dll/${{ env.NAME_WIN64 }} \
142126
--title "${{ env.TAG_NAME }}" \
143127
--notes "Automated plugin release"

0 commit comments

Comments
 (0)