Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/actions/build-and-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ runs:

- name: Test
shell: bash
run: dotnet test -c Release --no-build --logger trx --results-directory TestResults
run: dotnet test -c Release --no-build --no-restore --logger trx --results-directory TestResults
13 changes: 5 additions & 8 deletions .github/actions/create-release-artifacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,16 @@ runs:
steps:
- uses: actions/setup-dotnet@v5

- name: Create Binaries
- name: Create binaries
shell: bash
run: |
arch="${{ inputs.arch }}"
dotnet tool install --global wix --version 4.0.6
dotnet publish ./DesktopClock/DesktopClock.csproj -o "publish/$arch" -c Release --os win --arch "$arch" -p:Version=${{ inputs.version }}
wix build Product.wxs -d MainExeSource="publish/$arch/DesktopClock.exe" -o "publish/DesktopClock-${{ inputs.version }}-$arch.msi"
dotnet publish ./DesktopClock/DesktopClock.csproj -o "publish/${{ inputs.arch }}" -c Release --os win --arch "${{ inputs.arch }}" -p:Version="${{ inputs.version }}"
wix build Product.wxs -d "MainExeSource=publish/${{ inputs.arch }}/DesktopClock.exe" -o "publish/DesktopClock-${{ inputs.version }}-${{ inputs.arch }}.msi"

- name: Create Portable ZIP
- name: Create portable ZIP
shell: pwsh
run: |
$arch = "${{ inputs.arch }}"
Compress-Archive -Path "publish/$arch/DesktopClock.exe" -DestinationPath "publish/DesktopClock-${{ inputs.version }}-$arch.zip"
run: Compress-Archive -Path "publish/${{ inputs.arch }}/DesktopClock.exe" -DestinationPath "publish/DesktopClock-${{ inputs.version }}-${{ inputs.arch }}.zip" -Force

- uses: actions/upload-artifact@v7
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: Format
runs-on: windows-2025
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- uses: actions/setup-dotnet@v5

Expand All @@ -29,7 +29,7 @@ jobs:
name: Build and test
runs-on: windows-2025
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- uses: ./.github/actions/build-and-test

Expand All @@ -49,7 +49,7 @@ jobs:
matrix:
arch: [x64, arm64]
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- uses: ./.github/actions/create-release-artifacts
with:
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ on:
default: true

permissions:
contents: write
contents: read

jobs:
build-test:
name: Build and test
runs-on: windows-2025
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- uses: ./.github/actions/build-and-test

Expand All @@ -38,7 +38,7 @@ jobs:
matrix:
arch: [x64, arm64]
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- uses: ./.github/actions/create-release-artifacts
with:
Expand All @@ -50,7 +50,9 @@ jobs:
needs:
- build-test
- package
runs-on: windows-2025
runs-on: ubuntu-24.04
permissions:
contents: write
steps:
- uses: actions/download-artifact@v8
with:
Expand All @@ -65,7 +67,7 @@ jobs:
tag: "v${{ inputs.version }}"
artifacts: "release-artifacts/*.zip,release-artifacts/*.msi"
generateReleaseNotes: true
prerelease: ${{ contains(inputs.version, 'preview') }}
prerelease: ${{ contains(inputs.version, '-') }}
allowUpdates: ${{ inputs.updateRelease }}
removeArtifacts: true
omitBodyDuringUpdate: true
Loading