Skip to content

Commit 01b85b8

Browse files
committed
fixed build and release
1 parent 4e39aa1 commit 01b85b8

1 file changed

Lines changed: 20 additions & 44 deletions

File tree

.github/workflows/build-and-release.yml

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ jobs:
116116
Write-Host "Executable size: $([math]::Round($size, 2)) MB"
117117
shell: powershell
118118

119-
- name: Install WiX Toolset v4
119+
- name: Install WiX Toolset v5
120120
run: |
121-
Write-Host "Installing WiX Toolset v4..."
122-
dotnet tool install --global wix
121+
Write-Host "Installing WiX Toolset v5..."
122+
dotnet tool install --global wix --version 5.0.1
123123
124124
# Ensure WiX is in PATH
125125
$env:PATH = "$env:USERPROFILE\.dotnet\tools;$env:PATH"
@@ -128,10 +128,9 @@ jobs:
128128
wix --version
129129
130130
Write-Host "Installing WiX UI extension globally..."
131-
wix extension add --global WixToolset.UI.wixext
131+
wix extension add --global WixToolset.UI.wixext/5.0.1
132132
133133
Write-Host "Verifying UI extension..."
134-
wix extension list
135134
wix extension list --global
136135
137136
Write-Host "WiX installation complete"
@@ -256,7 +255,7 @@ jobs:
256255
create-release:
257256
name: Create GitHub Release
258257
runs-on: ubuntu-latest
259-
needs: [build, linux-build, docker-build]
258+
needs: [build, linux-build]
260259
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
261260

262261
steps:
@@ -286,14 +285,6 @@ jobs:
286285
name: linux-build
287286
path: ./linux-build
288287

289-
- name: Download Docker artifacts
290-
if: needs.docker-build.result == 'success'
291-
uses: actions/download-artifact@v4
292-
with:
293-
name: docker-release-files
294-
path: ./docker-release
295-
continue-on-error: true
296-
297288
- name: Get MSI filename
298289
id: msi_info
299290
run: |
@@ -308,17 +299,6 @@ jobs:
308299
echo "MSI file not found, using default name"
309300
fi
310301
311-
- name: Check Docker build status
312-
id: docker_status
313-
run: |
314-
if [ "${{ needs.docker-build.result }}" == "success" ]; then
315-
echo "docker_success=true" >> $GITHUB_OUTPUT
316-
echo "Docker build succeeded"
317-
else
318-
echo "docker_success=false" >> $GITHUB_OUTPUT
319-
echo "Docker build failed or was skipped - release will not include Docker files"
320-
fi
321-
322302
- name: Create Release
323303
uses: softprops/action-gh-release@v1
324304
with:
@@ -680,19 +660,20 @@ jobs:
680660
type=raw,value=${{ steps.docker_version.outputs.docker_tag }}
681661
type=raw,value=latest,enable=${{ steps.docker_version.outputs.is_release == 'true' }}
682662
683-
- name: Build and push Docker image
684-
uses: docker/build-push-action@v5
685-
with:
686-
context: .
687-
file: ./docker/Dockerfile
688-
push: true
689-
tags: ${{ steps.meta.outputs.tags }}
690-
labels: ${{ steps.meta.outputs.labels }}
691-
platforms: linux/amd64,linux/arm64
692-
cache-from: type=gha
693-
cache-to: type=gha,mode=max
694-
build-args: |
695-
APP_VERSION=${{ steps.docker_version.outputs.app_version }}
663+
# Commented out to speed up CI - Docker build takes too long
664+
# - name: Build and push Docker image
665+
# uses: docker/build-push-action@v5
666+
# with:
667+
# context: .
668+
# file: ./docker/Dockerfile
669+
# push: true
670+
# tags: ${{ steps.meta.outputs.tags }}
671+
# labels: ${{ steps.meta.outputs.labels }}
672+
# platforms: linux/amd64,linux/arm64
673+
# cache-from: type=gha
674+
# cache-to: type=gha,mode=max
675+
# build-args: |
676+
# APP_VERSION=${{ steps.docker_version.outputs.app_version }}
696677

697678
- name: Generate docker-compose.yml for release
698679
if: steps.docker_version.outputs.is_release == 'true'
@@ -979,7 +960,7 @@ jobs:
979960
build-status-check:
980961
name: Build Status Check
981962
runs-on: ubuntu-latest
982-
needs: [build, linux-build, docker-build]
963+
needs: [build, linux-build]
983964
if: always()
984965

985966
steps:
@@ -995,9 +976,4 @@ jobs:
995976
echo "Cannot merge to main until build succeeds"
996977
exit 1
997978
fi
998-
if [ "${{ needs.docker-build.result }}" == "success" ]; then
999-
echo "[PASS] Docker build succeeded"
1000-
elif [ "${{ needs.docker-build.result }}" == "failure" ]; then
1001-
echo "[WARN] Docker build failed - continuing anyway (Docker build is optional)"
1002-
fi
1003979
echo "[PASS] Required builds succeeded - safe to merge"

0 commit comments

Comments
 (0)