Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI stuff #1935

Merged
merged 20 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-appimage.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CMake Build (AppImage x86-64)
name: AppImage

on:
push:
Expand Down
76 changes: 0 additions & 76 deletions .github/workflows/build-macos-universal.yml

This file was deleted.

84 changes: 84 additions & 0 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: macOS

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build-macos:
strategy:
matrix:
arch: [x86_64, arm64]

name: ${{ matrix.arch }}
runs-on: macos-13
steps:
- name: Check out sources
uses: actions/checkout@v3
- name: Install dependencies for package building
run: |
brew install autoconf automake autoconf-archive libtool && pip3 install setuptools
- name: Set up CMake
uses: lukka/get-cmake@latest
- name: Set up vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: c8696863d371ab7f46e213d8f5ca923c4aef2a00
- name: Build
uses: lukka/run-cmake@v10
with:
configurePreset: release-mac-${{ matrix.arch }}
buildPreset: release-mac-${{ matrix.arch }}
- name: Compress app bundle
shell: bash
run: |
cd build/release-mac-${{ matrix.arch }}
zip -r -y ../../macOS-${{ matrix.arch }}.zip melonDS.app
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: macOS-${{ matrix.arch }}
path: macOS-${{ matrix.arch }}.zip

universal-binary:
name: Universal binary
needs: [build-macos]
runs-on: macos-13
steps:
- name: Download x86_64
uses: actions/download-artifact@v4
with:
name: macOS-x86_64
path: x86_64
- name: Download arm64
uses: actions/download-artifact@v4
with:
name: macOS-arm64
path: arm64
- name: Combine app bundles
shell: bash
run: |
unzip x86_64/*.zip -d x86_64
unzip arm64/*.zip -d arm64
lipo {x86_64,arm64}/melonDS.app/Contents/MacOS/melonDS -create -output melonDS
cp -a arm64/melonDS.app melonDS.app
cp melonDS melonDS.app/Contents/MacOS/melonDS
codesign -s - --deep melonDS.app
zip -r -y macOS-universal.zip melonDS.app
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: macOS-universal
path: macOS-universal.zip
- name: Clean up architecture-specific artifacts
uses: geekyeggo/delete-artifact@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
failOnError: false
name: |
macOS-x86_64
macOS-arm64
3 changes: 2 additions & 1 deletion .github/workflows/build-ubuntu-aarch64.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CMake Build (Ubuntu aarch64)
name: Ubuntu

on:
push:
Expand All @@ -13,6 +13,7 @@ env:

jobs:
build:
name: aarch64
runs-on: ubuntu-20.04
container: ubuntu:20.04

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CMake Build (Ubuntu x86-64)
name: Ubuntu

on:
push:
Expand All @@ -10,6 +10,7 @@ on:

jobs:
build:
name: x86_64

runs-on: ubuntu-20.04

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CMake Build (Windows x86-64)
name: Windows

on:
push:
Expand Down
Loading