update config

This commit is contained in:
RandomityGuy 2023-01-07 23:44:29 +05:30
parent 4eadf91a14
commit 6a7353c070

View file

@ -3,7 +3,6 @@
version: 2.1 version: 2.1
orbs: orbs:
win: circleci/windows@4.1.1 # The Windows orb give you everything you need to start using the Windows executor. win: circleci/windows@4.1.1 # The Windows orb give you everything you need to start using the Windows executor.
# Define a job to be invoked later in a workflow. # Define a job to be invoked later in a workflow.
# See: https://circleci.com/docs/2.0/configuration-reference/#jobs # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
jobs: jobs:
@ -160,7 +159,7 @@ jobs:
git clone --depth=1 https://github.com/RandomityGuy/hashlink git clone --depth=1 https://github.com/RandomityGuy/hashlink
cd hashlink cd hashlink
# Fix OpenAL # Fix OpenAL
# curl -L https://github.com/nullobsi/hashlink/commit/a09491918cc4b83c2cb9fcded855fe967857385f.diff | git apply curl -L https://github.com/nullobsi/hashlink/commit/a09491918cc4b83c2cb9fcded855fe967857385f.diff | git apply
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DCMAKE_FIND_FRAMEWORK=LAST -DWITH_SQLITE=OFF -DWITH_SSL=OFF -DWITH_UV=OFF -DBUILD_TESTING=OFF -DCMAKE_MACOSX_RPATH=TRUE cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DCMAKE_FIND_FRAMEWORK=LAST -DWITH_SQLITE=OFF -DWITH_SSL=OFF -DWITH_UV=OFF -DBUILD_TESTING=OFF -DCMAKE_MACOSX_RPATH=TRUE
cmake --build build --config Release -j$NPROC cmake --build build --config Release -j$NPROC
sudo cmake --install build sudo cmake --install build
@ -189,7 +188,7 @@ jobs:
name: Package app bundle name: Package app bundle
command: | command: |
cd ~/MBHaxe cd ~/MBHaxe
./package-macos.sh v1.1.4 ./package-macos.sh v$COMMIT_TAG
cd "macos-dist/MarbleBlast Gold.app/Contents/MacOS" cd "macos-dist/MarbleBlast Gold.app/Contents/MacOS"
otool -L marblegame otool -L marblegame
cd ../Frameworks cd ../Frameworks
@ -209,6 +208,7 @@ jobs:
do do
install_name_tool -change /usr/lib/libz.1.dylib @rpath/libz.1.dylib $i install_name_tool -change /usr/lib/libz.1.dylib @rpath/libz.1.dylib $i
done done
- run: - run:
name: Sign app bundle name: Sign app bundle
command: | command: |
@ -283,7 +283,6 @@ jobs:
mv /tmp/include/sdl include/sdl mv /tmp/include/sdl include/sdl
mv /tmp/include/openal include/openal mv /tmp/include/openal include/openal
MSBuild.exe hl.sln -m -nologo -p:Configuration=Release -p:Platform=x64 MSBuild.exe hl.sln -m -nologo -p:Configuration=Release -p:Platform=x64
- run: - run:
name: Install haxe dependencies name: Install haxe dependencies
command: | command: |
@ -296,7 +295,6 @@ jobs:
haxelib dev hlopenal ~/deps/hashlink/libs/openal haxelib dev hlopenal ~/deps/hashlink/libs/openal
haxelib dev hlsdl ~/deps/hashlink/libs/sdl haxelib dev hlsdl ~/deps/hashlink/libs/sdl
haxelib dev hashlink ~/deps/hashlink/other/haxelib haxelib dev hashlink ~/deps/hashlink/other/haxelib
- run: - run:
name: Compile MBHaxe name: Compile MBHaxe
command: | command: |
@ -340,7 +338,6 @@ jobs:
command: | command: |
cd ~/project cd ~/project
7z a MBHaxe-Gold-Win.zip release/ 7z a MBHaxe-Gold-Win.zip release/
- store_artifacts: - store_artifacts:
path: ~/project/MBHaxe-Gold-Win.zip path: ~/project/MBHaxe-Gold-Win.zip
@ -348,7 +345,7 @@ jobs:
# Invoke jobs via workflows # Invoke jobs via workflows
# See: https://circleci.com/docs/2.0/configuration-reference/#workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
workflows: workflows:
say-hello-workflow: build-mac:
jobs: jobs:
- build: - build:
filters: filters: