From 8a78c9bbcf6ff380b039c176406b0eaac7a7e9b9 Mon Sep 17 00:00:00 2001 From: Razish Date: Sat, 14 Oct 2023 03:51:55 +1100 Subject: [PATCH] do the windows arch dance --- .github/workflows/build.yml | 3 +++ package.lua | 12 ++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1ddf3c..0316dbd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,6 +70,9 @@ jobs: working-directory: ${{ github.workspace }} shell: pwsh run: | + if ( ${{ matrix.arch }} -eq "x86" ) { + $env:TARGET_ARCH="x86" + } $env:PATH="${{ github.workspace }}\.lua\lib;$env:PATH" $env:LUA_CPATH="$env:USERPROFILE\AppData\Roaming\LuaRocks\lib\lua\5.4\?.dll" lua package.lua diff --git a/package.lua b/package.lua index 737c8ac..96f4ec6 100755 --- a/package.lua +++ b/package.lua @@ -17,10 +17,10 @@ local function get_platform_details() if package.config:sub(1, 1) == '\\' then -- Windows local env_OS = os.getenv('OS') - print('env_OS: ' .. env_OS) local env_ARCH = os.getenv('PROCESSOR_ARCHITECTURE') - print('env_ARCH: ' .. env_ARCH) - if env_OS and env_ARCH then return env_OS, env_ARCH end + local archTranslation = {AMD64 = 'x86_64'}; + local arch = archTranslation[env_ARCH] and archTranslation[env_ARCH] or env_ARCH + if env_OS and arch then return env_OS, arch end else -- hopefullu a POSIX-y unix local os_name = io.popen('uname -s', 'r'):read('*l') @@ -32,20 +32,16 @@ local function get_platform_details() end local host_platform, arch = get_platform_details() -print('host_platform: ' .. host_platform) -print('arch: ' .. arch) local target_arch = os.getenv('TARGET_ARCH') -- this can override what arch we're packaging arch = target_arch and target_arch or arch -print('arch: ' .. arch) local nixy = true and package.config:find('/') or false local suffix = host_platform .. '_' .. arch local libExt = ({ Linux = '.so', -- - Windows = '.dll', -- + Windows_NT = '.dll', -- Darwin = '.dylib', })[host_platform] -print('libExt: ' .. libExt) local extension = nixy and '.zip' or '.pk3' local paks = {