Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
durswd committed Dec 22, 2024
1 parent 9a7aed3 commit 01acdb3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
17 changes: 8 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
os: windows-2019
label: Win
- name: mac
os: macos-12
os: macos-13
label: Mac

name: Build on ${{ matrix.name }}
Expand All @@ -108,9 +108,14 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: '3.8'
python-version: '3.12'
architecture: 'x64'

- name: Pip
run: |
python -m pip install setuptools
python3 -m pip install setuptools
- uses: actions/checkout@v2
with:
submodules: true
Expand All @@ -120,12 +125,6 @@ jobs:
git lfs install
git lfs pull
- name: Install Cmake for macOS (because of libpng)
if: matrix.name == 'mac'
uses: jwlawson/[email protected]
with:
cmake-version: '3.18.x'

- name: Install Linux Dependencies
if: matrix.name == 'linux'
run: |
Expand All @@ -148,7 +147,7 @@ jobs:
if [ "${{ matrix.name }}" = "mac" ];
then
export PACKAGEING_FOR_MAC=1
sudo xcode-select --switch /Applications/Xcode_13.1.app
sudo xcode-select --switch /Applications/Xcode_14.1.app
fi
python3 build.py || python build.py
Expand Down
2 changes: 1 addition & 1 deletion Tool/EffekseerLauncher/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.15)

if(APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version" FORCE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "Minimum OS X deployment version" FORCE)
endif()

project(EffekseerLauncher C CXX)
Expand Down

0 comments on commit 01acdb3

Please sign in to comment.