mirror of
https://github.com/gabehf/Fladder.git
synced 2026-03-07 21:48:14 -08:00
chore: Fix build step windows
This commit is contained in:
parent
010db6057e
commit
ef6411dcf6
2 changed files with 23 additions and 21 deletions
32
.github/workflows/build.yml
vendored
32
.github/workflows/build.yml
vendored
|
|
@ -16,13 +16,13 @@ on:
|
||||||
- reopened
|
- reopened
|
||||||
schedule:
|
schedule:
|
||||||
# Run nightly at midnight UTC, but only if there were changes to develop
|
# Run nightly at midnight UTC, but only if there were changes to develop
|
||||||
- cron: '0 0 * * *'
|
- cron: "0 0 * * *"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
build_type:
|
build_type:
|
||||||
description: 'Build type (release, nightly, or auto)'
|
description: "Build type (release, nightly, or auto)"
|
||||||
required: false
|
required: false
|
||||||
default: 'auto'
|
default: "auto"
|
||||||
type: choice
|
type: choice
|
||||||
options:
|
options:
|
||||||
- auto
|
- auto
|
||||||
|
|
@ -74,7 +74,7 @@ jobs:
|
||||||
# For PRs and other events, build but don't release
|
# For PRs and other events, build but don't release
|
||||||
BUILD_TYPE="development"
|
BUILD_TYPE="development"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "build_type=${BUILD_TYPE}" >> $GITHUB_OUTPUT
|
echo "build_type=${BUILD_TYPE}" >> $GITHUB_OUTPUT
|
||||||
echo "should_run=true" >> $GITHUB_OUTPUT
|
echo "should_run=true" >> $GITHUB_OUTPUT
|
||||||
echo "Build type determined: ${BUILD_TYPE}"
|
echo "Build type determined: ${BUILD_TYPE}"
|
||||||
|
|
@ -382,7 +382,7 @@ jobs:
|
||||||
build-linux-flatpak:
|
build-linux-flatpak:
|
||||||
name: "Flatpak"
|
name: "Flatpak"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: needs.fetch-info.outputs.build_type == 'release'
|
if: needs.fetch-info.outputs.build_type == 'release' || needs.fetch-info.outputs.build_type == 'nightly'
|
||||||
needs: [fetch-info, build-linux]
|
needs: [fetch-info, build-linux]
|
||||||
container:
|
container:
|
||||||
image: bilelmoussaoui/flatpak-github-actions:gnome-46
|
image: bilelmoussaoui/flatpak-github-actions:gnome-46
|
||||||
|
|
@ -491,7 +491,7 @@ jobs:
|
||||||
else
|
else
|
||||||
echo "No existing nightly release found."
|
echo "No existing nightly release found."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Clean up any orphaned tags
|
# Clean up any orphaned tags
|
||||||
if git tag -l | grep -q "^${{ env.NIGHTLY_TAG }}$"; then
|
if git tag -l | grep -q "^${{ env.NIGHTLY_TAG }}$"; then
|
||||||
echo "Deleting orphaned nightly tag..."
|
echo "Deleting orphaned nightly tag..."
|
||||||
|
|
@ -506,7 +506,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
# Get the latest release tag
|
# Get the latest release tag
|
||||||
LATEST_RELEASE=$(gh release list --limit 1 --exclude-drafts --json tagName --jq '.[0].tagName' || echo "")
|
LATEST_RELEASE=$(gh release list --limit 1 --exclude-drafts --json tagName --jq '.[0].tagName' || echo "")
|
||||||
|
|
||||||
if [ -z "$LATEST_RELEASE" ]; then
|
if [ -z "$LATEST_RELEASE" ]; then
|
||||||
echo "No previous releases found, generating changelog from initial commit"
|
echo "No previous releases found, generating changelog from initial commit"
|
||||||
CHANGELOG=$(git log --pretty=format:"- %s (%h)" --no-merges)
|
CHANGELOG=$(git log --pretty=format:"- %s (%h)" --no-merges)
|
||||||
|
|
@ -514,30 +514,30 @@ jobs:
|
||||||
echo "Generating changelog from $LATEST_RELEASE to HEAD"
|
echo "Generating changelog from $LATEST_RELEASE to HEAD"
|
||||||
CHANGELOG=$(git log ${LATEST_RELEASE}..HEAD --pretty=format:"- %s (%h)" --no-merges)
|
CHANGELOG=$(git log ${LATEST_RELEASE}..HEAD --pretty=format:"- %s (%h)" --no-merges)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$CHANGELOG" ]; then
|
if [ -z "$CHANGELOG" ]; then
|
||||||
CHANGELOG="- No changes since last release"
|
CHANGELOG="- No changes since last release"
|
||||||
fi
|
fi
|
||||||
# Create changelog with proper formatting
|
# Create changelog with proper formatting
|
||||||
cat > changelog.md <<-EOF
|
cat > changelog.md <<-EOF
|
||||||
# 🌙 Nightly Build - $(date -u "+%Y-%m-%d %H:%M:%S UTC")
|
# 🌙 Nightly Build - $(date -u "+%Y-%m-%d %H:%M:%S UTC")
|
||||||
|
|
||||||
This is an automated nightly build containing the latest changes from the develop branch.
|
This is an automated nightly build containing the latest changes from the develop branch.
|
||||||
|
|
||||||
**⚠️ Warning:** This is a development build and may contain bugs or incomplete features.
|
**⚠️ Warning:** This is a development build and may contain bugs or incomplete features.
|
||||||
|
|
||||||
## 📋 Changes since last release:
|
## 📋 Changes since last release:
|
||||||
|
|
||||||
$CHANGELOG
|
$CHANGELOG
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
📅 **Build Date:** $(date -u "+%Y-%m-%d %H:%M:%S UTC")
|
📅 **Build Date:** $(date -u "+%Y-%m-%d %H:%M:%S UTC")
|
||||||
🔧 **Build Number:** ${{ github.run_number }}
|
🔧 **Build Number:** ${{ github.run_number }}
|
||||||
📝 **Commit:** ${{ github.sha }}
|
📝 **Commit:** ${{ github.sha }}
|
||||||
🌿 **Branch:** develop
|
🌿 **Branch:** develop
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
echo "changelog_file=changelog.md" >> $GITHUB_OUTPUT
|
echo "changelog_file=changelog.md" >> $GITHUB_OUTPUT
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
@ -622,7 +622,7 @@ jobs:
|
||||||
- name: Move Linux AppImages
|
- name: Move Linux AppImages
|
||||||
run: |
|
run: |
|
||||||
mv fladder-linux-appimage/Fladder_x86_64.AppImage Fladder-Linux-${{ steps.version.outputs.version }}.AppImage
|
mv fladder-linux-appimage/Fladder_x86_64.AppImage Fladder-Linux-${{ steps.version.outputs.version }}.AppImage
|
||||||
mv fladder-linux-appimage/Fladder_x86_64.AppImage.zsync Fladder-Linux-${{ steps.version.outputs.version }}.AppImage.zsync
|
mv fladder-linux-appimage/Fladder_x86_64.AppImage.zsync Fladder-Linux-${{ steps.version.outputs.version }}.AppImage.zsync
|
||||||
- name: Download Artifacts Web
|
- name: Download Artifacts Web
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,11 @@ SetupLogging=yes
|
||||||
UninstallLogging=yes
|
UninstallLogging=yes
|
||||||
UninstallDisplayName="Fladder"
|
UninstallDisplayName="Fladder"
|
||||||
UninstallDisplayIcon={app}\fladder.exe
|
UninstallDisplayIcon={app}\fladder.exe
|
||||||
SetupIconFile="D:\a\Fladder\Fladder\icons\production\fladder_icon.ico"
|
SetupIconFile="icons\production\fladder_icon.ico"
|
||||||
LicenseFile="D:\a\Fladder\Fladder\LICENSE"
|
LicenseFile="LICENSE"
|
||||||
WizardImageFile=D:\a\Fladder\Fladder\assets\windows-installer\fladder-installer-100.bmp,D:\a\Fladder\Fladder\assets\windows-installer\fladder-installer-125.bmp,D:\a\Fladder\Fladder\assets\windows-installer\fladder-installer-150.bmp
|
WizardImageFile="assets\windows-installer\fladder-installer-100.bmp", \
|
||||||
|
"assets\windows-installer\fladder-installer-125.bmp", \
|
||||||
|
"assets\windows-installer\fladder-installer-150.bmp"
|
||||||
|
|
||||||
[Languages]
|
[Languages]
|
||||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||||
|
|
@ -32,7 +34,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||||
|
|
||||||
[Files]
|
[Files]
|
||||||
Source: "D:\a\Fladder\Fladder\build\windows\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
Source: "build\windows\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||||
|
|
||||||
[Icons]
|
[Icons]
|
||||||
Name: "{autoprograms}\Fladder"; Filename: "{app}\fladder.exe"
|
Name: "{autoprograms}\Fladder"; Filename: "{app}\fladder.exe"
|
||||||
|
|
@ -56,4 +58,4 @@ begin
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue