diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 85b4b203..68f6acc2 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,12 +5,6 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] - workflow_call: - inputs: - upload_artifacts: - description: Should upload artifacts or not - type: boolean - default: false jobs: build-dmg: @@ -37,7 +31,6 @@ jobs: run: cmake --build build -t install - name: Create DMG - if: ${{ inputs.upload_artifacts }} run: | mkdir VoxelEngineDmgContent cp -r build/res VoxelEngineDmgContent/ @@ -45,7 +38,6 @@ jobs: hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO - name: Upload artifacts - if: ${{ inputs.upload_artifacts }} uses: actions/upload-artifact@v4 with: name: VoxelEngineMacOs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1863467a..a1186ce3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,35 +14,18 @@ jobs: build_type: Release upload_artifacts: true - build_release_macos: - name: Build Release MacOS - uses: ./.github/workflows/macos.yml - with: - upload_artifacts: true - create_release: - needs: [build_release, build_release_macos] + needs: build_release runs-on: ubuntu-latest steps: - name: Download artifacts uses: actions/download-artifact@v4 with: name: VoxelEngine - - - name: Download artifacts (MacOS) - uses: actions/download-artifact@v4 - with: - name: VoxelEngineMacOs - - name: Pack artifacts run: | chmod +x VoxelEngine zip -r VoxelEngine.zip res VoxelEngine - - - name: Pack artifacts (MacOS DMG) - run: | - cp VoxelEngineMacApp.dmg VoxelEngine.dmg - - name: Grab and store version run: | tag_name=$(echo ${{ github.ref }} | grep -oE "v[^/]+$") @@ -58,4 +41,3 @@ jobs: prerelease: false files: | VoxelEngine.zip - VoxelEngine.dmg