diff --git a/.github/workflows/electron-master.yml b/.github/workflows/electron-master.yml
index 9caf558cc7..bbc40771cc 100644
--- a/.github/workflows/electron-master.yml
+++ b/.github/workflows/electron-master.yml
@@ -112,18 +112,9 @@ jobs:
!packages/desktop-electron/dist/Actual-windows.exe
packages/desktop-electron/dist/*.AppImage
packages/desktop-electron/dist/*.flatpak
- - name: Retrieve AppImage SHA256 for Flathub
- id: appimage_sha256
- run: |
- APPIMAGE_X64_SHA256=$(sha256sum packages/desktop-electron/dist/Actual-linux-x86_64.AppImage | awk '{ print $1 }')
- APPIMAGE_ARM64_SHA256=$(sha256sum packages/desktop-electron/dist/Actual-linux-arm64.AppImage | awk '{ print $1 }')
- echo "appimage_x64_sha256=$APPIMAGE_X64_SHA256" >> "$GITHUB_OUTPUT"
- echo "appimage_arm64_sha256=$APPIMAGE_ARM64_SHA256" >> "$GITHUB_OUTPUT"
outputs:
version: ${{ steps.process_version.outputs.version }}
- appimage_x64_sha256: ${{ steps.appimage_sha256.outputs.appimage_x64_sha256 }}
- appimage_arm64_sha256: ${{ steps.appimage_sha256.outputs.appimage_arm64_sha256 }}
publish-microsoft-store:
needs: build
@@ -172,6 +163,19 @@ jobs:
runs-on: ubuntu-22.04
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
steps:
+ - name: Download Linux artifacts
+ uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+ with:
+ name: actual-electron-ubuntu-22.04
+
+ - name: Calculate AppImage SHA256
+ id: appimage_sha256
+ run: |
+ APPIMAGE_X64_SHA256=$(sha256sum packages/desktop-electron/dist/Actual-linux-x86_64.AppImage | awk '{ print $1 }')
+ APPIMAGE_ARM64_SHA256=$(sha256sum packages/desktop-electron/dist/Actual-linux-arm64.AppImage | awk '{ print $1 }')
+ echo "APPIMAGE_X64_SHA256=$APPIMAGE_X64_SHA256" >> "$GITHUB_ENV"
+ echo "APPIMAGE_ARM64_SHA256=$APPIMAGE_ARM64_SHA256" >> "$GITHUB_ENV"
+
- name: Checkout Flathub repo
uses: actions/checkout@v6
with:
@@ -181,11 +185,11 @@ jobs:
- name: Update manifest with new SHA256
run: |
# Replace x86_64 entry
- sed -i "/x86_64.AppImage/{n;s|sha256:.*|sha256: ${{ needs.build.outputs.appimage_x64_sha256 }}|}" com.actualbudget.actual.yml
+ sed -i "/x86_64.AppImage/{n;s|sha256:.*|sha256: ${{ env.APPIMAGE_X64_SHA256 }}|}" com.actualbudget.actual.yml
sed -i "/x86_64.AppImage/s|url:.*|url: https://github.com/actualbudget/actual/releases/download/v${{ needs.build.outputs.version }}/Actual-linux-x86_64.AppImage|" com.actualbudget.actual.yml
# Replace arm64 entry
- sed -i "/arm64.AppImage/{n;s|sha256:.*|sha256: ${{ needs.build.outputs.appimage_arm64_sha256 }}|}" com.actualbudget.actual.yml
+ sed -i "/arm64.AppImage/{n;s|sha256:.*|sha256: ${{ env.APPIMAGE_ARM64_SHA256 }}|}" com.actualbudget.actual.yml
sed -i "/arm64.AppImage/s|url:.*|url: https://github.com/actualbudget/actual/releases/download/v${{ needs.build.outputs.version }}/Actual-linux-arm64.AppImage|" com.actualbudget.actual.yml
cat com.actualbudget.actual.yml
diff --git a/packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml b/packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml
index 6f59c70582..2298f1c68d 100644
--- a/packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml
+++ b/packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml
@@ -28,36 +28,36 @@
- https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/budget-gnome-dark.png
- Budget screen (dark theme)
+ https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/budget-gnome-dark.png
+ Budget screen (dark theme)
- https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/budget-gnome-light.png
- Budget screen (light theme)
+ https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/budget-gnome-light.png
+ Budget screen (light theme)
- https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/transactions-gnome-dark.png
- Transactions screen (dark theme)
+ https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/transactions-gnome-dark.png
+ Transactions screen (dark theme)
- https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/transactions-gnome-light.png
- Transactions screen (light theme)
+ https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/transactions-gnome-light.png
+ Transactions screen (light theme)
- https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/schedules-gnome-dark.png
- Schedules screen (dark theme)
+ https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/schedules-gnome-dark.png
+ Schedules screen (dark theme)
- https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/schedules-gnome-light.png
- Schedules screen (light theme)
+ https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/schedules-gnome-light.png
+ Schedules screen (light theme)
- https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/reports-gnome-dark.png
- Reports screen (dark theme)
+ https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/reports-gnome-dark.png
+ Reports screen (dark theme)
- https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/reports-gnome-light.png
- Reports screen (light theme)
+ https://raw.githubusercontent.com/actualbudget/actual/master/packages/desktop-electron/screenshots/reports-gnome-light.png
+ Reports screen (light theme)
diff --git a/upcoming-release-notes/6544.md b/upcoming-release-notes/6544.md
new file mode 100644
index 0000000000..6536d8d77b
--- /dev/null
+++ b/upcoming-release-notes/6544.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MikesGlitch]
+---
+
+Fix electron workflow job ordering for calculating hashes for flathub release.