diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2020-11-24 15:48:22 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2020-11-24 15:48:22 +0100 |
| commit | 9932b10bf191b6da19a2c64d5c7750b7525243ec (patch) | |
| tree | 97908726231a6f1a0bbda3ca4a5d41986716a30e /.github/workflows | |
| parent | f8da24c5ec35504a1192cb494ebe1d27aa172b04 (diff) | |
Add -D__int64=int64_t flag to Java Windows build
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build-windows-package.yml | 19 | ||||
| -rw-r--r-- | .github/workflows/windows-testing.yml | 11 |
2 files changed, 5 insertions, 25 deletions
diff --git a/.github/workflows/build-windows-package.yml b/.github/workflows/build-windows-package.yml index 7d1bcc2a1..5db2458ac 100644 --- a/.github/workflows/build-windows-package.yml +++ b/.github/workflows/build-windows-package.yml @@ -50,37 +50,28 @@ jobs: make install cp /mingw64/bin/*.dll /c/tmp-dist - - name: Upload C runtime to artifact - uses: actions/upload-artifact@v2 - with: - name: gf-${{ github.sha }}-windows - path: C:\tmp-dist\* - if-no-files-found: error - - name: Build Java bindings shell: msys2 {0} run: | cd src/runtime/java make \ JNI_INCLUDES="-I \"/c/Program Files/Java/jdk8u275-b01/include\" -I \"/c/Program Files/Java/jdk8u275-b01/include/win32\" -I \"/mingw64/include\" " \ - WINDOWS_LDFLAGS="-L\"/mingw64/lib\" -no-undefined" + WINDOWS_LDFLAGS="-L\"/mingw64/lib\" -no-undefined -D__int64=int64_t" make install + # cp ... /c/tmp-dist - # - name: Upload Java bindings to artifact - # # - name: Build Python bindings - # - # - name: Upload Python bindings to artifact - name: Build GF run: | cabal install --only-dependencies -fserver cabal configure -fserver cabal build + copy dist\build\gf\gf.exe C:\tmp-dist - - name: Upload exe to artifact + - name: Upload artifact uses: actions/upload-artifact@v2 with: name: gf-${{ github.sha }}-windows - path: dist\build\gf\gf.exe + path: C:\tmp-dist\* if-no-files-found: error diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml deleted file mode 100644 index 02c409c5a..000000000 --- a/.github/workflows/windows-testing.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Windows testing - -on: push - -jobs: - run: - runs-on: windows-2019 - - steps: - - run: | - dir "C:\Program Files\Java\jdk8u275-b01\include" |