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
69 changes: 42 additions & 27 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,32 @@ jobs:
cd packages/mitmproxy;
pnpm run test;

- name: "npm run electron:build"
- name: "Cache Flatpak runtime (Ubuntu)"
if: ${{ matrix.os == 'ubuntu' }}
id: cache-flatpak-runtime
uses: actions/cache@v4
with:
path: ~/.local/share/flatpak
key: flatpak-runtime-freedesktop-21.08

- name: "Install Flatpak tooling (Ubuntu)"
if: ${{ matrix.os == 'ubuntu' }}
run: |
sudo apt-get update -y
sudo apt-get install -y flatpak flatpak-builder xdg-desktop-portal appstream fuse3
# Allow flatpak-builder's bwrap sandbox to create user namespaces on Ubuntu 24.04
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
# Remove bwrap AppArmor profile if present; it can block sandbox operations beyond userns
sudo apparmor_parser -R /etc/apparmor.d/bwrap 2>/dev/null || true
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
if [ "${{ steps.cache-flatpak-runtime.outputs.cache-hit }}" != "true" ]; then
flatpak install --user -y flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
fi
flatpak --version
flatpak-builder --version

- name: "npm run electron:build (Windows/macOS)"
if: ${{ matrix.os != 'ubuntu' }}
run: |
echo "======================================================================";
echo "cd packages/gui";
Expand All @@ -140,6 +165,22 @@ jobs:
echo "--------------------";
npm run electron:build;

- name: "npm run electron:build (Ubuntu)"
if: ${{ matrix.os == 'ubuntu' }}
env:
DEBUG: "@malept/flatpak-bundler"
run: |
echo "======================================================================";
echo "cd packages/gui";
echo "--------------------";
cd packages/gui;
ls -lah;

echo "======================================================================";
echo "npm run electron:build";
echo "--------------------";
dbus-run-session -- npm run electron:build;

- name: 'Print dir "packages/gui/dist_electron/"'
run: |
echo "======================================================================";
Expand Down Expand Up @@ -172,13 +213,11 @@ jobs:
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz;
mv DevSidecar-${{ steps.package-info.outputs.version }}-aarch64.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm;
mv DevSidecar-${{ steps.package-info.outputs.version }}-aarch64.flatpak DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak;
#-------------------------------------------------------------------------------------------------------------------------
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.flatpak DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak;
ls -lah;
- name: "Rename artifacts - macOS"
if: ${{ matrix.os == 'macos' }}
Expand Down Expand Up @@ -286,13 +325,6 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm"
if-no-files-found: error
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
if-no-files-found: error

# -------------------------------------------------------------------------------------------------------------------------
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb"
Expand Down Expand Up @@ -323,13 +355,6 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm"
if-no-files-found: error
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
if-no-files-found: error
# endregion Upload artifacts - Linux

# Upload artifacts - macOS
Expand Down Expand Up @@ -441,11 +466,6 @@ jobs:
with:
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm"
path: release
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
uses: actions/download-artifact@v4.1.8
with:
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
path: release
# -------------------------------------------------------------------------------------------------------------------------
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb"
uses: actions/download-artifact@v4.1.8
Expand All @@ -467,11 +487,6 @@ jobs:
with:
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm"
path: release
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
uses: actions/download-artifact@v4.1.8
with:
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
path: release
# -------------------------------------------------------------------------------------------------------------------------
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"
uses: actions/download-artifact@v4.1.8
Expand Down
60 changes: 43 additions & 17 deletions .github/workflows/test-and-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- 1.x
- develop
- test*
- fix*
paths-ignore:
- "_script/**"
- "doc/**"
Expand Down Expand Up @@ -140,7 +141,32 @@ jobs:
cd packages/mitmproxy;
pnpm run test;

- name: "npm run electron:build"
- name: "Cache Flatpak runtime (Ubuntu)"
if: ${{ matrix.os == 'ubuntu' }}
id: cache-flatpak-runtime
uses: actions/cache@v4
with:
path: ~/.local/share/flatpak
key: flatpak-runtime-freedesktop-21.08

- name: "Install Flatpak tooling (Ubuntu)"
if: ${{ matrix.os == 'ubuntu' }}
run: |
sudo apt-get update -y
sudo apt-get install -y flatpak flatpak-builder xdg-desktop-portal appstream fuse3
# Allow flatpak-builder's bwrap sandbox to create user namespaces on Ubuntu 24.04
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
# Remove bwrap AppArmor profile if present; it can block sandbox operations beyond userns
sudo apparmor_parser -R /etc/apparmor.d/bwrap 2>/dev/null || true
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
if [ "${{ steps.cache-flatpak-runtime.outputs.cache-hit }}" != "true" ]; then
flatpak install --user -y flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
fi
flatpak --version
flatpak-builder --version

- name: "npm run electron:build (Windows/macOS)"
if: ${{ matrix.os != 'ubuntu' }}
run: |
echo "======================================================================";
echo "cd packages/gui";
Expand All @@ -153,6 +179,22 @@ jobs:
echo "--------------------";
npm run electron:build;

- name: "npm run electron:build (Ubuntu)"
if: ${{ matrix.os == 'ubuntu' }}
env:
DEBUG: "@malept/flatpak-bundler"
run: |
echo "======================================================================";
echo "cd packages/gui";
echo "--------------------";
cd packages/gui;
ls -lah;

echo "======================================================================";
echo "npm run electron:build";
echo "--------------------";
dbus-run-session -- npm run electron:build;

- name: 'Print dir "packages/gui/dist_electron/"'
run: |
echo "======================================================================";
Expand Down Expand Up @@ -185,13 +227,11 @@ jobs:
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz;
mv DevSidecar-${{ steps.package-info.outputs.version }}-aarch64.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm;
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.flatpak DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak;
#-------------------------------------------------------------------------------------------------------------------------
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm;
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.flatpak DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak;
ls -lah;
- name: "Rename artifacts - macOS"
if: ${{ matrix.os == 'macos' }}
Expand Down Expand Up @@ -298,13 +338,6 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm"
if-no-files-found: error
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
if-no-files-found: error
# -------------------------------------------------------------------------------------------------------------------------
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb"
uses: actions/upload-artifact@v4.4.0
Expand Down Expand Up @@ -334,13 +367,6 @@ jobs:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm"
if-no-files-found: error
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
uses: actions/upload-artifact@v4.4.0
if: ${{ matrix.os == 'ubuntu' }}
with:
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
if-no-files-found: error
# endregion Upload artifacts - Linux

# Upload artifacts - macOS
Expand Down
Binary file removed packages/gui/build/mac/1024x1024.png
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/gui/vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module.exports = defineConfig({
to: 'extra',
},
],
appId: 'dev-sidecar',
appId: 'cn.docmirror.DevSidecar',
productName: 'dev-sidecar',
// eslint-disable-next-line no-template-curly-in-string
artifactName: 'DevSidecar-${version}-${arch}.${ext}',
Expand Down Expand Up @@ -113,7 +113,7 @@ module.exports = defineConfig({
},
{
target: 'flatpak',
arch: ['x64', 'arm64', 'armv7l'],
arch: ['x64'],
},
],
category: 'System',
Expand Down