diff --git a/.github/workflows/package-and-release.yml b/.github/workflows/package-and-release.yml index b348d5f..e7847a9 100644 --- a/.github/workflows/package-and-release.yml +++ b/.github/workflows/package-and-release.yml @@ -84,3 +84,4 @@ jobs: Stardrop-win-x64.zip Stardrop-linux-x64.zip Stardrop-osx-x64.zip + Stardrop-osx-arm64.zip diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f33dcf4..1a85d96 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -31,7 +31,38 @@ env: run-name: "[${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || 'Default Branch' }}] Packaging" jobs: - package-macos: + package-macos-arm64: + if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'generate packages') + runs-on: macos-latest + + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ env.BRANCH }} + repository: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name || github.repository }} + - run: mkdir -p path/to/release-artifacts + - name: Publish (MacOS - Creating) + run: | + mkdir -p "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/MacOS" + mkdir -p "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/Resources" + dotnet publish "${{ env.WORKING_DIRECTORY }}" --output "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/MacOS" --configuration "${{ env.CONFIGURATION }}" --runtime "osx-arm64" --framework "net8.0" --self-contained + - name: Publish (MacOS - Packaging) + working-directory: "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app" + run: | + cp ${GITHUB_WORKSPACE}/Stardrop/Assets/Info.plist "Contents/Info.plist" + cp ${GITHUB_WORKSPACE}/Stardrop/Assets/Stardrop.icns "Contents/Resources/Stardrop.icns" + + chmod +x "Contents/MacOS/Stardrop" + (cd ../ && codesign --force --deep -s - Stardrop.app) + + (cd ../ && zip -r ${GITHUB_WORKSPACE}/Stardrop-osx-arm64.zip "Stardrop.app") + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: release-artifacts-macos-arm64 + path: | + Stardrop-osx-arm64.zip + package-macos-x64: if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'generate packages') runs-on: macos-latest @@ -59,7 +90,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: release-artifacts-macos + name: release-artifacts-macos-x64 path: | Stardrop-osx-x64.zip package-linux: diff --git a/Stardrop/Stardrop.csproj b/Stardrop/Stardrop.csproj index 1f7a5db..a06a9cb 100644 --- a/Stardrop/Stardrop.csproj +++ b/Stardrop/Stardrop.csproj @@ -12,13 +12,6 @@ true true - - - x64 - - - x64 -