Skip to content

Commit a7d3e39

Browse files
authored
Run build.bat on windows (#2)
1 parent b91b02e commit a7d3e39

File tree

1 file changed

+26
-15
lines changed

1 file changed

+26
-15
lines changed

.github/workflows/publish.yml

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ on:
44
workflow_dispatch:
55
inputs:
66
version:
7-
description: Version
7+
description: blst version
88
default: 0.3.15
9+
suffix:
10+
description: version suffix
11+
default: -SNAPSHOT
912

1013
jobs:
1114
build-native:
@@ -27,47 +30,55 @@ jobs:
2730
- platform: darwin
2831
os: macos-14
2932
brew-packages: swig
30-
cmd: ./build.sh
33+
cmd: ./run.me
3134
- platform: darwin
3235
arch: x86-64
3336
# https://github.com/openjdk/jdk/commit/5b1baa3d10d9ef3f07f133ece8a5f1d40311c74d#diff-6078ab1e47c6bb312b7f41e7539b4849189260c38f9b359c205a5aa0f633533dR278
3437
cmd: CC='cc -target x86_64-apple-darwin20.1.0' CXX='c++ -std=c++11 -target x86_64-apple-darwin20.1.0' ./build.sh && mv supranational/blst/Mac/{aarch64,x86_64}
3538
- platform: linux
36-
os: ubuntu-22.04
39+
os: ubuntu-24.04
3740
extra-packages: gcc-9 g++-9
38-
cmd: CC=gcc-9 CXX=g++-9 ./build.sh
41+
cmd: CC=gcc-9 CXX=g++-9 ./build.sh -D__BLST_PORTABLE__
3942
- platform: linux
4043
arch: aarch64
4144
extra-packages: gcc-9-aarch64-linux-gnu g++-9-aarch64-linux-gnu
42-
cmd: CC=aarch64-linux-gnu-gcc-9 CXX=aarch64-linux-gnu-g++-9 ./build.sh && mv supranational/blst/Linux/{amd64,aarch64}
45+
cmd: CC=aarch64-linux-gnu-gcc-9 CXX=aarch64-linux-gnu-g++-9 ./build.sh -D__BLST_PORTABLE__ && mv supranational/blst/Linux/{amd64,aarch64}
4346
- platform: linux
4447
arch: x86
4548
extra-packages: gcc-9-multilib g++-9-multilib
46-
cmd: CC='gcc-9 -m32' CXX='g++-9 -m32' ./build.sh && mv supranational/blst/Linux/{amd64,x86}
49+
cmd: CC='gcc-9 -m32' CXX='g++-9 -m32' ./build.sh -D__BLST_PORTABLE__ && mv supranational/blst/Linux/{amd64,x86}
4750
- platform: win32
4851
os: windows-2022
49-
cmd: bash -c './build.sh'
52+
cmd: |
53+
cmd /c ..\..\build.bat
54+
mkdir supranational\blst\Windows\amd64
55+
swig -c++ -java -package supranational.blst -outdir supranational\blst -o blst_wrap.cpp ..\blst.swg
56+
cl /nologo /MT /LD /O2 /W3 /wd4267 /EHsc /D_CRT_SECURE_NO_WARNINGS /I "$env:JAVA_HOME\include" /I ..\ /I "$env:JAVA_HOME\include\win32" blst_wrap.cpp blst.lib /link /OUT:supranational/blst/Windows/amd64/blst.dll
5057
5158
steps:
52-
- uses: actions/checkout@v4
59+
- if: matrix.platform == 'darwin'
60+
run: echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
61+
- if: matrix.brew-packages != ''
62+
run: brew install ${{ matrix.brew-packages }}
63+
- run: swig -version
64+
- uses: actions/checkout@v6
5365
with:
5466
repository: supranational/blst
55-
ref: v${{ inputs.version }}
56-
- uses: actions/setup-java@v4
67+
- uses: actions/setup-java@v5
5768
with:
5869
distribution: 'temurin'
5970
java-version: '11'
60-
- if: ${{ matrix.extra-packages }}
71+
- if: matrix.extra-packages != ''
6172
run: |
6273
sudo apt-get update
6374
sudo apt-get install -y ${{ matrix.extra-packages }}
64-
- if: ${{ matrix.brew-packages }}
65-
run: brew install ${{ matrix.brew-packages }}
75+
- if: matrix.os == 'windows-2022'
76+
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
6677
- name: Build native image
6778
run: |
6879
cd bindings/java
6980
${{ matrix.cmd }}
70-
- uses: actions/upload-artifact@v4
81+
- uses: actions/upload-artifact@v7
7182
with:
7283
name: blst-${{ env.target-path }}.zip
7384
path: |
@@ -101,5 +112,5 @@ jobs:
101112
mkdir -p src/main/{resources,java}/supranational/blst
102113
mv artifacts/*.java src/main/java/supranational/blst
103114
mv artifacts/* src/main/resources/supranational/blst/
104-
mvn versions:set -DnewVersion=${{ inputs.version }}-SNAPSHOT -DgenerateBackupPoms=false
115+
mvn versions:set -DnewVersion=${{ inputs.version }}${{ inputs.suffix }} -DgenerateBackupPoms=false
105116
mvn -B deploy

0 commit comments

Comments
 (0)