Enable macos artifact's default
This commit is contained in:
parent
a5907302e5
commit
db729cbfbb
8
.github/workflows/macos.yml
vendored
8
.github/workflows/macos.yml
vendored
@ -5,12 +5,6 @@ on:
|
|||||||
branches: [ "main" ]
|
branches: [ "main" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ "main" ]
|
branches: [ "main" ]
|
||||||
workflow_call:
|
|
||||||
inputs:
|
|
||||||
upload_artifacts:
|
|
||||||
description: Should upload artifacts or not
|
|
||||||
type: boolean
|
|
||||||
default: false
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-dmg:
|
build-dmg:
|
||||||
@ -37,7 +31,6 @@ jobs:
|
|||||||
run: cmake --build build -t install
|
run: cmake --build build -t install
|
||||||
|
|
||||||
- name: Create DMG
|
- name: Create DMG
|
||||||
if: ${{ inputs.upload_artifacts }}
|
|
||||||
run: |
|
run: |
|
||||||
mkdir VoxelEngineDmgContent
|
mkdir VoxelEngineDmgContent
|
||||||
cp -r build/res VoxelEngineDmgContent/
|
cp -r build/res VoxelEngineDmgContent/
|
||||||
@ -45,7 +38,6 @@ jobs:
|
|||||||
hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
|
hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
if: ${{ inputs.upload_artifacts }}
|
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: VoxelEngineMacOs
|
name: VoxelEngineMacOs
|
||||||
|
|||||||
20
.github/workflows/release.yml
vendored
20
.github/workflows/release.yml
vendored
@ -14,35 +14,18 @@ jobs:
|
|||||||
build_type: Release
|
build_type: Release
|
||||||
upload_artifacts: true
|
upload_artifacts: true
|
||||||
|
|
||||||
build_release_macos:
|
|
||||||
name: Build Release MacOS
|
|
||||||
uses: ./.github/workflows/macos.yml
|
|
||||||
with:
|
|
||||||
upload_artifacts: true
|
|
||||||
|
|
||||||
create_release:
|
create_release:
|
||||||
needs: [build_release, build_release_macos]
|
needs: build_release
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Download artifacts
|
- name: Download artifacts
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: VoxelEngine
|
name: VoxelEngine
|
||||||
|
|
||||||
- name: Download artifacts (MacOS)
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: VoxelEngineMacOs
|
|
||||||
|
|
||||||
- name: Pack artifacts
|
- name: Pack artifacts
|
||||||
run: |
|
run: |
|
||||||
chmod +x VoxelEngine
|
chmod +x VoxelEngine
|
||||||
zip -r VoxelEngine.zip res VoxelEngine
|
zip -r VoxelEngine.zip res VoxelEngine
|
||||||
|
|
||||||
- name: Pack artifacts (MacOS DMG)
|
|
||||||
run: |
|
|
||||||
cp VoxelEngineMacApp.dmg VoxelEngine.dmg
|
|
||||||
|
|
||||||
- name: Grab and store version
|
- name: Grab and store version
|
||||||
run: |
|
run: |
|
||||||
tag_name=$(echo ${{ github.ref }} | grep -oE "v[^/]+$")
|
tag_name=$(echo ${{ github.ref }} | grep -oE "v[^/]+$")
|
||||||
@ -58,4 +41,3 @@ jobs:
|
|||||||
prerelease: false
|
prerelease: false
|
||||||
files: |
|
files: |
|
||||||
VoxelEngine.zip
|
VoxelEngine.zip
|
||||||
VoxelEngine.dmg
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user