mirror of
https://github.com/diamante0018/master-tool.git
synced 2025-05-09 22:14:52 +00:00
feature(github): fix arm64 build
This commit is contained in:
parent
427f9b117d
commit
1271c44fe4
44
.github/workflows/build.yml
vendored
44
.github/workflows/build.yml
vendored
@ -30,7 +30,7 @@ jobs:
|
|||||||
platform: x64
|
platform: x64
|
||||||
steps:
|
steps:
|
||||||
- name: Check out files
|
- name: Check out files
|
||||||
uses: actions/checkout@v3.5.2
|
uses: actions/checkout@v3.5.3
|
||||||
with:
|
with:
|
||||||
submodules: true
|
submodules: true
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
@ -39,8 +39,13 @@ jobs:
|
|||||||
- name: Add msbuild to PATH
|
- name: Add msbuild to PATH
|
||||||
uses: microsoft/setup-msbuild@v1.3.1
|
uses: microsoft/setup-msbuild@v1.3.1
|
||||||
|
|
||||||
|
- name: Install Premake5
|
||||||
|
uses: abel0b/setup-premake@v2.2
|
||||||
|
with:
|
||||||
|
version: "5.0.0-beta2"
|
||||||
|
|
||||||
- name: Generate project files
|
- name: Generate project files
|
||||||
run: cmd /C call generate.bat
|
run: premake5 vs2022
|
||||||
|
|
||||||
- name: Set up problem matching
|
- name: Set up problem matching
|
||||||
uses: ammaraskar/msvc-problem-matcher@master
|
uses: ammaraskar/msvc-problem-matcher@master
|
||||||
@ -67,6 +72,7 @@ jobs:
|
|||||||
- Release
|
- Release
|
||||||
arch:
|
arch:
|
||||||
- x64
|
- x64
|
||||||
|
- arm64
|
||||||
include:
|
include:
|
||||||
- configuration: Debug
|
- configuration: Debug
|
||||||
config: debug
|
config: debug
|
||||||
@ -74,21 +80,42 @@ jobs:
|
|||||||
config: release
|
config: release
|
||||||
steps:
|
steps:
|
||||||
- name: Check out files
|
- name: Check out files
|
||||||
uses: actions/checkout@v3.5.2
|
uses: actions/checkout@v3.5.3
|
||||||
with:
|
with:
|
||||||
submodules: true
|
submodules: true
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: false
|
lfs: false
|
||||||
|
|
||||||
|
- name: Install dependencies (arm64)
|
||||||
|
if: matrix.arch == 'arm64'
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get -y install crossbuild-essential-arm64
|
||||||
|
|
||||||
- name: Install Mold
|
- name: Install Mold
|
||||||
uses: rui314/setup-mold@staging
|
uses: rui314/setup-mold@staging
|
||||||
|
|
||||||
|
- name: Install Premake5
|
||||||
|
uses: abel0b/setup-premake@v2.2
|
||||||
|
with:
|
||||||
|
version: "5.0.0-beta2"
|
||||||
|
|
||||||
- name: Generate project files
|
- name: Generate project files
|
||||||
run: ./generate.sh
|
run: premake5 gmake2
|
||||||
|
|
||||||
- name: Set up problem matching
|
- name: Set up problem matching
|
||||||
uses: ammaraskar/gcc-problem-matcher@master
|
uses: ammaraskar/gcc-problem-matcher@master
|
||||||
|
|
||||||
|
- name: Set up CC environment variables
|
||||||
|
if: matrix.arch == 'arm64'
|
||||||
|
run: |
|
||||||
|
echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Set up CXX environment variables
|
||||||
|
if: matrix.arch == 'arm64'
|
||||||
|
run: |
|
||||||
|
echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Build ${{matrix.configuration}} ${{matrix.arch}} binaries
|
- name: Build ${{matrix.configuration}} ${{matrix.arch}} binaries
|
||||||
run: |
|
run: |
|
||||||
pushd build
|
pushd build
|
||||||
@ -124,14 +151,19 @@ jobs:
|
|||||||
platform: arm64
|
platform: arm64
|
||||||
steps:
|
steps:
|
||||||
- name: Check out files
|
- name: Check out files
|
||||||
uses: actions/checkout@v3.5.2
|
uses: actions/checkout@v3.5.3
|
||||||
with:
|
with:
|
||||||
submodules: true
|
submodules: true
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: false
|
lfs: false
|
||||||
|
|
||||||
|
- name: Install Premake5
|
||||||
|
uses: abel0b/setup-premake@v2.2
|
||||||
|
with:
|
||||||
|
version: "5.0.0-beta2"
|
||||||
|
|
||||||
- name: Generate project files
|
- name: Generate project files
|
||||||
run: ./generate.sh
|
run: premake5 gmake2
|
||||||
|
|
||||||
- name: Set up problem matching
|
- name: Set up problem matching
|
||||||
uses: ammaraskar/gcc-problem-matcher@master
|
uses: ammaraskar/gcc-problem-matcher@master
|
||||||
|
2
deps/libtomcrypt
vendored
2
deps/libtomcrypt
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 0173cac3be1475163cd279c5eee3c9e288b9aae0
|
Subproject commit fae62af0ab16f469c2512ec04575dd60ca018657
|
2
deps/libtommath
vendored
2
deps/libtommath
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 38bb3696e5d7cb99d3cb06f3357205d0faf04b04
|
Subproject commit 787c6147218759ed076ad8f3742d15505ed0822e
|
@ -1,3 +0,0 @@
|
|||||||
@echo off
|
|
||||||
git submodule update --init --recursive
|
|
||||||
tools\premake5 %* vs2022
|
|
@ -1,7 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
git submodule update --init --recursive
|
|
||||||
if [ "$(uname)" == "Darwin" ]; then
|
|
||||||
./tools/premake5-mac gmake2
|
|
||||||
else
|
|
||||||
./tools/premake5-linux gmake2
|
|
||||||
fi
|
|
@ -41,7 +41,7 @@ configurations {"Debug", "Release"}
|
|||||||
if os.istarget("darwin") then
|
if os.istarget("darwin") then
|
||||||
platforms {"x64", "arm64"}
|
platforms {"x64", "arm64"}
|
||||||
else
|
else
|
||||||
platforms {"x86", "x64"}
|
platforms {"x86", "x64", "arm64"}
|
||||||
end
|
end
|
||||||
|
|
||||||
filter "platforms:x86"
|
filter "platforms:x86"
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user