I will get this workflow right or die trying

This commit is contained in:
Struma 2023-05-04 14:14:24 -04:00
parent 5aae148571
commit b13b3b7958
8 changed files with 30 additions and 13 deletions

View file

@ -10,6 +10,11 @@ jobs:
name: Windows
runs-on: windows-latest
steps:
- uses: benjlevesque/short-sha@v2.2
id: short-sha
with:
length: 6
- uses: msys2/setup-msys2@v2
with:
msystem: mingw64
@ -63,7 +68,7 @@ jobs:
- uses: actions/upload-artifact@v3
with:
name: mkxp-z.windows.${{github.ref_name}}-${{github.sha}}
name: mkxp-z.windows.${{github.ref_name}}-${{steps.short-sha.outputs.sha}}
path: |
build/artifact/*.dll
build/artifact/*.exe
@ -71,9 +76,14 @@ jobs:
build/artifact/stdlib/
build-linux:
name: Linux x86_64
runs-on: ubuntu-latest
name: Ubuntu 22.04
runs-on: ubuntu-22.04
steps:
- uses: benjlevesque/short-sha@v2.2
id: short-sha
with:
length: 6
- name: Checkout repository
uses: actions/checkout@v3
@ -109,13 +119,18 @@ jobs:
- uses: actions/upload-artifact@v3
with:
name: mkxp-z.linux.${{github.ref_name}}-${{github.sha}}
name: mkxp-z.linux.${{github.ref_name}}-${{steps.short-sha.outputs.sha}}
path: build/local/
build-macos:
name: macOS
runs-on: macos-latest
steps:
- uses: benjlevesque/short-sha@v2.2
id: short-sha
with:
length: 6
- name: Checkout repository
uses: actions/checkout@v3
@ -126,7 +141,7 @@ jobs:
macos/Dependencies/build-macosx-arm64
macos/Dependencies/build-macosx-universal
macos/Dependencies/downloads
key: mac-${{ hashFiles('macos/Dependencies/dependencies.make,macos/Dependencies/.Intel,macos/Dependencies/.AppleSilicon,macos/Dependencies/setup,macos/Dependencies/make_macuniversal') }}
key: mac-${{ hashFiles('macos/Dependencies/*.make', 'macos/Dependencies/*.sh') }}
- name: Install Homebrew tools
run: |
@ -151,5 +166,5 @@ jobs:
- name: Upload archive
uses: actions/upload-artifact@v3
with:
name: mkxp-z.macos.${{github.ref_name}}-${{github.sha}}
name: mkxp-z.macos.${{github.ref_name}}-${{steps.short-sha.outputs.sha}}
path: build/Build/Products/Release/Z-universal.app.zip

View file

@ -1,7 +1,9 @@
# mkxp-z
<p align="center"><b>
<a href="https://github.com/mkxp-z/mkxp-z/releases">Downloads</a>
<a href="https://github.com/mkxp-z/mkxp-z/releases">Releases</a>
<a href="https://github.com/mkxp-z/mkxp-z/actions/workflows/autobuild.yml">Automatic Builds</a>
<a href="https://github.com/mkxp-z/mkxp-z/wiki">Documentation</a>
</b></p>

View file

@ -10,4 +10,4 @@ OPENAL_FLAGS := -DALSOFT_CPUEXT_NEON=no ${OPENAL_FLAGS}
OPENSSL_FLAGS := darwin64-$(ARCH)-cc
RUBY_FLAGS := ${RUBY_FLAGS}
include dependencies.make
include common.make

View file

@ -10,20 +10,20 @@ def run_build(arch)
if `xcodebuild -version`.scan(/Xcode (\d+)/)[0][0].to_i >= 12
printf("Building libraries for Apple Silicon...\n")
printf("====================================================\n")
code = system("make everything -f .AppleSilicon")
code = system("make everything -f arm64.make")
return code if !code
end
printf("====================================================\n")
printf("Building libraries for Intel...\n")
printf("====================================================\n")
code = (system("make everything -f .Intel"))
code = (system("make everything -f x86_64.make"))
return code if !code
printf("====================================================\n")
printf("Performing post-setup...\n")
printf("====================================================\n")
printf("Creating universal libraries ...\n")
return system("./make_macuniversal")
return system("./make_macuniversal.sh")
end
def fix_steam(libpath)

View file

@ -12,4 +12,4 @@ RUBY_FLAGS := ${RUBY_FLAGS}
include dependencies.make
include common.make

View file

@ -4,4 +4,4 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd "$DIR/Dependencies"
./setup
./setup.sh