Skip to content

Commit 94d2159

Browse files
cute-omegacute-omega
authored
Merge pull request #619 from docmirror/test-enhance
Test enhance
2 parents a22f7ac + e44a41e commit 94d2159

6 files changed

Lines changed: 10099 additions & 5020 deletions

File tree

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

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
os:
2626
- windows
2727
- ubuntu
28-
- ubuntu-24.04-arm
28+
# - ubuntu-24.04-arm
2929
- macos
3030
node:
3131
- 22
@@ -152,37 +152,37 @@ jobs:
152152
flatpak --version
153153
flatpak-builder --version
154154
155-
# - name: "Cache Flatpak runtime (Linux ARM64)"
156-
# if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
157-
# id: cache-flatpak-runtime-linux-arm64
158-
# uses: actions/cache@v4
159-
# with:
160-
# path: ~/.local/share/flatpak
161-
# key: flatpak-runtime-freedesktop-21.08
162-
#
163-
# - name: "Install Flatpak tooling (Linux ARM64)"
164-
# if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
165-
# run: |
166-
# sudo apt-get update -y
167-
# sudo apt-get install -y flatpak flatpak-builder xdg-desktop-portal appstream fuse3
168-
# # Allow flatpak-builder's bwrap sandbox to create user namespaces on Ubuntu 24.04
169-
# sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
170-
# # Remove bwrap AppArmor profile if present; it can block sandbox operations beyond userns
171-
# sudo apparmor_parser -R /etc/apparmor.d/bwrap 2>/dev/null || true
172-
# flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
173-
# if [ "${{ steps.cache-flatpak-runtime-linux-arm64.outputs.cache-hit }}" != "true" ]; then
174-
# flatpak install --user -y flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
175-
# fi
176-
# flatpak --version
177-
# flatpak-builder --version
178-
#
179-
# - name: "Special preparation for Linux ARM64 build"
180-
# if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
181-
# run: |
182-
# echo "======================================================================";
183-
# echo "Run _script/linux-arm64-prepare.sh";
184-
# echo "--------------------";
185-
# bash _script/linux-arm64-prepare.sh;
155+
- name: "Cache Flatpak runtime (Linux ARM64)"
156+
if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
157+
id: cache-flatpak-runtime-linux-arm64
158+
uses: actions/cache@v4
159+
with:
160+
path: ~/.local/share/flatpak
161+
key: flatpak-runtime-freedesktop-21.08
162+
163+
- name: "Install Flatpak tooling (Linux ARM64)"
164+
if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
165+
run: |
166+
sudo apt-get update -y
167+
sudo apt-get install -y flatpak flatpak-builder xdg-desktop-portal appstream fuse3
168+
# Allow flatpak-builder's bwrap sandbox to create user namespaces on Ubuntu 24.04
169+
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
170+
# Remove bwrap AppArmor profile if present; it can block sandbox operations beyond userns
171+
sudo apparmor_parser -R /etc/apparmor.d/bwrap 2>/dev/null || true
172+
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
173+
if [ "${{ steps.cache-flatpak-runtime-linux-arm64.outputs.cache-hit }}" != "true" ]; then
174+
flatpak install --user -y flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
175+
fi
176+
flatpak --version
177+
flatpak-builder --version
178+
179+
- name: "Special preparation for Linux ARM64 build"
180+
if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
181+
run: |
182+
echo "======================================================================";
183+
echo "Run _script/linux-arm64-prepare.sh";
184+
echo "--------------------";
185+
bash _script/linux-arm64-prepare.sh;
186186
187187
- name: "npm run electron:build (Windows/macOS)"
188188
if: ${{ matrix.os != 'ubuntu' }}
@@ -199,8 +199,7 @@ jobs:
199199
npm run electron:build;
200200
201201
- name: "npm run electron:build (Linux & Linux ARM64)"
202-
# if: ${{ matrix.os == 'ubuntu' || matrix.os == 'ubuntu-24.04-arm' }}
203-
if: ${{ matrix.os == 'ubuntu' }}
202+
if: ${{ matrix.os == 'ubuntu' || matrix.os == 'ubuntu-24.04-arm' }}
204203
env:
205204
DEBUG: "@malept/flatpak-bundler"
206205
run: |
@@ -255,13 +254,13 @@ jobs:
255254
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm;
256255
# armv7l flatpak is on Linux ARM64 runner
257256
ls -lah;
258-
# - name: "Rename artifacts - Linux ARM64"
259-
# if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
260-
# run: |
261-
# mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.flatpak DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak;
262-
# #-------------------------------------------------------------------------------------------------------------------------
263-
# mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.flatpak DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak;
264-
# ls -lah;
257+
- name: "Rename artifacts - Linux ARM64"
258+
if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
259+
run: |
260+
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.flatpak DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak;
261+
#-------------------------------------------------------------------------------------------------------------------------
262+
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.flatpak DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak;
263+
ls -lah;
265264
- name: "Rename artifacts - macOS"
266265
if: ${{ matrix.os == 'macos' }}
267266
run: |
@@ -400,23 +399,23 @@ jobs:
400399
if-no-files-found: error
401400
# endregion Upload artifacts - Linux
402401

403-
# # region Upload artifacts - Linux ARM64
404-
# - name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
405-
# uses: actions/upload-artifact@v4.4.0
406-
# if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
407-
# with:
408-
# path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak
409-
# name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
410-
# if-no-files-found: error
411-
# # -------------------------------------------------------------------------------------------------------------------------
412-
# - name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
413-
# uses: actions/upload-artifact@v4.4.0
414-
# if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
415-
# with:
416-
# path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak
417-
# name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
418-
# if-no-files-found: error
419-
# # endregion Upload artifacts - Linux ARM64
402+
# region Upload artifacts - Linux ARM64
403+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
404+
uses: actions/upload-artifact@v4.4.0
405+
if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
406+
with:
407+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak
408+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.flatpak"
409+
if-no-files-found: error
410+
# -------------------------------------------------------------------------------------------------------------------------
411+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
412+
uses: actions/upload-artifact@v4.4.0
413+
if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
414+
with:
415+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak
416+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.flatpak"
417+
if-no-files-found: error
418+
# endregion Upload artifacts - Linux ARM64
420419

421420
# Upload artifacts - macOS
422421
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"

0 commit comments

Comments
 (0)