try fix macos (#65)

pull/66/head
Miepee 3 years ago committed by GitHub
parent b1d388fdbf
commit 274d38fab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -8,14 +8,14 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-latest, macOS-latest, windows-latest] os: [ubuntu-latest, macos-13, windows-latest]
configuration: [Release] configuration: [Release]
include: include:
- os: ubuntu-latest - os: ubuntu-latest
COMMAND: AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -r ubuntu.18.04-x64 --no-self-contained -o builds/ubuntu-latest COMMAND: AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -r ubuntu.18.04-x64 --no-self-contained -o builds/ubuntu-latest
ARTIFACT: AM2RLauncher/builds/ubuntu-latest ARTIFACT: AM2RLauncher/builds/ubuntu-latest
POSTBUILD: echo "No post build to do!" POSTBUILD: echo "No post build to do!"
- os: macOS-latest - os: macos-13
COMMAND: AM2RLauncher.Mac -o builds/macOS-latest COMMAND: AM2RLauncher.Mac -o builds/macOS-latest
ARTIFACT: AM2RLauncher/builds/macOS-latest ARTIFACT: AM2RLauncher/builds/macOS-latest
POSTBUILD: rm -r AM2RLauncher/builds/macOS-latest/* && mv AM2RLauncher/AM2RLauncher.Mac/bin/Release/net6.0-macos/AM2RLauncher.Mac.app AM2RLauncher/builds/macOS-latest/AM2RLauncher.Mac.app POSTBUILD: rm -r AM2RLauncher/builds/macOS-latest/* && mv AM2RLauncher/AM2RLauncher.Mac/bin/Release/net6.0-macos/AM2RLauncher.Mac.app AM2RLauncher/builds/macOS-latest/AM2RLauncher.Mac.app
@ -32,13 +32,16 @@ jobs:
- name: Setup .NET - name: Setup .NET
uses: actions/setup-dotnet@v4 uses: actions/setup-dotnet@v4
with: with:
dotnet-version: 6.0.x dotnet-version: 8.x.x
- name: Install Mac workload - name: Install Mac workload
working-directory: ./AM2RLauncher working-directory: ./AM2RLauncher
run: dotnet workload install macos && dotnet workload restore run: dotnet workload install macos && dotnet workload restore
- name: Restore dependencies - name: Restore dependencies
working-directory: ./AM2RLauncher working-directory: ./AM2RLauncher
run: dotnet restore run: dotnet restore
- name: Switch XCode
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app/Contents/Developer
if: matrix.os == 'macos-13'
- name: Build - name: Build
working-directory: ./AM2RLauncher working-directory: ./AM2RLauncher
run: dotnet publish ${{ matrix.COMMAND }} -c "${{ matrix.configuration }}" run: dotnet publish ${{ matrix.COMMAND }} -c "${{ matrix.configuration }}"

@ -16,13 +16,13 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-latest, macOS-latest, windows-latest] os: [ubuntu-latest, macos-13, windows-latest]
configuration: [Release] configuration: [Release]
include: include:
- os: ubuntu-latest - os: ubuntu-latest
COMMAND: AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -r ubuntu.18.04-x64 --no-self-contained COMMAND: AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -r ubuntu.18.04-x64 --no-self-contained
ARTIFACT: AM2RLauncher/AM2RLauncher.Gtk/bin/Release/net6.0/ubuntu.18.04-x64/publish/ ARTIFACT: AM2RLauncher/AM2RLauncher.Gtk/bin/Release/net6.0/ubuntu.18.04-x64/publish/
- os: macOS-latest - os: macos-13
COMMAND: AM2RLauncher.Mac -o builds/macOS-latest COMMAND: AM2RLauncher.Mac -o builds/macOS-latest
ARTIFACT: AM2RLauncher/builds/macOS-latest ARTIFACT: AM2RLauncher/builds/macOS-latest
- os: windows-latest - os: windows-latest
@ -36,10 +36,13 @@ jobs:
- name: Setup .NET - name: Setup .NET
uses: actions/setup-dotnet@v4 uses: actions/setup-dotnet@v4
with: with:
dotnet-version: 6.0.x dotnet-version: 8.x.x
- name: Install Mac workload - name: Install Mac workload
working-directory: ./AM2RLauncher working-directory: ./AM2RLauncher
run: dotnet workload install macos run: dotnet workload install macos && dotnet workload restore
- name: Switch XCode
run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app/Contents/Developer
if: matrix.os == 'macos-13'
- name: Restore dependencies - name: Restore dependencies
working-directory: ./AM2RLauncher working-directory: ./AM2RLauncher
run: dotnet restore run: dotnet restore

@ -2,9 +2,9 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net6.0-macos</TargetFramework> <TargetFramework>net8.0-macos</TargetFramework>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers> <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion> <SupportedOSPlatformVersion>10.15</SupportedOSPlatformVersion>
<RollForward>LatestMajor</RollForward> <RollForward>LatestMajor</RollForward>
<Configurations>Debug;Release</Configurations> <Configurations>Debug;Release</Configurations>
<Platforms>AnyCPU</Platforms> <Platforms>AnyCPU</Platforms>

@ -9,7 +9,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0</string> <string>1.0</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>10.14</string> <string>10.15</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>

Loading…
Cancel
Save