Skip to content

Commit

Permalink
We can no longer install on Windows from a URL
Browse files Browse the repository at this point in the history
  • Loading branch information
dargueta committed Sep 18, 2024
1 parent cdc207f commit 65da293
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 140 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ indent_size = 2

[{Makefile,*.mk}]
indent_style = unset

[*.{yml,yaml}]
indent_size = 2
46 changes: 41 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ jobs:
operating-system:
- ubuntu-latest
- macos-13
- windows-latest
lua-version:
- "5.1"
- "5.2"
Expand All @@ -28,23 +27,60 @@ jobs:
- uses: actions/[email protected]
with:
persist-credentials: false
- name: Lua prereqs on Windows
uses: ilammy/msvc-dev-cmd@v1
if: runner.os == 'Windows'
- name: Install Lua
uses: leafo/[email protected]
with:
luaVersion: ${{ matrix.lua-version }}
# We need LUAJIT_ENABLE_GC64 on MacOS: https://github.com/moonjit/moonjit/issues/121
luaCompileFlags: XCFLAGS="-DLUAJIT_ENABLE_GC64=1"
- name: Install LuaRocks
uses: leafo/[email protected]
with:
luaRocksVersion: "3.11.1"
- name: Install Unicorn
run: make -C tools/ci install_unicorn UNICORN_VERSION=${{ matrix.unicorn-version }}
- name: Environment
run: luarocks config
- name: Install Binding
run: luarocks build
- name: Run tests
run: luarocks test

testing-windows:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
# Keep this identical to the *NIX one
# https://github.com/actions/runner/issues/1182
lua-version:
- "5.1"
- "5.2"
- "5.3"
- "5.4"
- "luajit-openresty"
steps:
- uses: actions/[email protected]
with:
persist-credentials: false
- name: Lua prereqs on Windows
uses: ilammy/msvc-dev-cmd@v1
- name: Install Lua
uses: leafo/[email protected]
with:
luaVersion: ${{ matrix.lua-version }}
- name: Install LuaRocks
# Note: This is a fork of the original by leafo. Switch back to that once
# https://github.com/leafo/gh-actions-luarocks/pull/14 has been merged.
uses: hishamhm/gh-actions-luarocks@5013277f6f115c27478f18c1f647f8de98390628
with:
luaRocksVersion: "3.11.1"
- name: Install Unicorn
run: make -C tools/ci install_unicorn UNICORN_VERSION=${{ matrix.unicorn-version }}
run: |
Expand-Archive -Path 'tools\ci\win64-8e6499f.zip'
Move-Item -Path '.\win64-8e6499f\windows_mingw64-shared\bin\libunicorn.dll' -Destination C:\Windows\System32
New-Item -Path ${Env:LOCALAPPDATA} -Name UnicornEngine -ItemType directory
Move-Item -Path '.\win64-8e6499f\windows_mingw64-shared\include\unicorn' -Destination ${Env:LOCALAPPDATA}/UnicornEngine
- name: Environment
run: luarocks config
- name: Install Binding
Expand Down
135 changes: 0 additions & 135 deletions tools/ci/install-unicorn-windows.py

This file was deleted.

Binary file added tools/ci/win64-8e6499f.zip
Binary file not shown.

0 comments on commit 65da293

Please sign in to comment.