Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,20 @@ jobs:
- name: Upload osx-x64 artifacts
uses: actions/[email protected]
with:
name: publish-osx
name: publish-osx-x64
path: .publish

- name: Restore osx-arm64 dependencies
run: dotnet restore -r osx-arm64
- name: Build osx-arm64
run: msbuild SQLSchemaCompare.sln /p:Configuration=Release /p:RuntimeIdentifier=osx-arm64
- name: Publish osx-arm64
run: dotnet publish SQLSchemaCompare.UI.csproj --no-build --no-restore -c Release -r osx-arm64
working-directory: SQLSchemaCompare.UI
- name: Upload osx-arm64 artifacts
uses: actions/[email protected]
with:
name: publish-osx-arm64
path: .publish

installer_win_x64:
Expand Down Expand Up @@ -134,9 +147,12 @@ jobs:
file: installer/*.{deb,rpm,tar.gz}
tag: ${{ github.ref }}

installer_osx_x64:
installer_osx:
runs-on: macos-latest
needs: build_artifacts
strategy:
matrix:
arch: [x64, arm64]
defaults:
run:
shell: bash
Expand All @@ -150,10 +166,10 @@ jobs:
with:
name: SQLSchemaCompare
path: SQLSchemaCompare
- name: Download publish-osx artifact
- name: Download publish-osx-${{ matrix.arch }} artifact
uses: actions/download-artifact@v4
with:
name: publish-osx
name: publish-osx-${{ matrix.arch }}
path: .publish
- name: Prepare artifacts
run: |
Expand All @@ -163,8 +179,10 @@ jobs:
cd SQLSchemaCompare
yarn install --frozen-lockfile
- name: Create installer
run: yarn dist-osx-x64
run: yarn dist-osx
working-directory: SQLSchemaCompare
env:
ARCH_SUFFIX: ${{ matrix.arch }}
- name: Upload installer to release
uses: svenstaro/upload-release-action@v2
with:
Expand All @@ -176,12 +194,13 @@ jobs:
clean_artifacts:
runs-on: windows-latest
if: always()
needs: [installer_win_x64, installer_linux_x64, installer_osx_x64]
needs: [installer_win_x64, installer_linux_x64, installer_osx]
steps:
- uses: geekyeggo/delete-artifact@v5
with:
name: |
SQLSchemaCompare
publish-win
publish-linux
publish-osx
publish-osx-x64
publish-osx-arm64
2 changes: 1 addition & 1 deletion SQLSchemaCompare.UI/SQLSchemaCompare.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>TiCodeX.SQLSchemaCompare.UI</RootNamespace>
<TypeScriptToolsVersion>latest</TypeScriptToolsVersion>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
<PublishDir>..\.publish</PublishDir>
<SelfContained>true</SelfContained>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions SQLSchemaCompare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"mac": {
"target": "default",
"category": "public.app-category.productivity",
"artifactName": "SQLSchemaCompare-${version}.${ext}",
"artifactName": "SQLSchemaCompare-${version}-${env.ARCH_SUFFIX}.${ext}",
"publish": {
"provider": "generic",
"url": ""
Expand Down Expand Up @@ -106,7 +106,7 @@
"start": "electron .",
"dist-win-x64": "electron-builder --win --publish always",
"dist-linux-x64": "electron-builder --linux --publish always",
"dist-osx-x64": "electron-builder --mac --publish always"
"dist-osx": "electron-builder --mac --publish always"
},
"postinstall": "electron-builder install-app-deps",
"devDependencies": {
Expand Down
Loading