Change wl-clipboard to meson build system in flatpak and build aarch64

This commit is contained in:
Bernd Schoolmann 2023-12-30 04:46:49 +01:00
parent adba8d1239
commit f3f9ae8692
No known key found for this signature in database
2 changed files with 40 additions and 17 deletions

View File

@ -11,10 +11,25 @@ jobs:
container: container:
image: bilelmoussaoui/flatpak-github-actions:gnome-45 image: bilelmoussaoui/flatpak-github-actions:gnome-45
options: --privileged options: --privileged
strategy:
matrix:
arch: [x86_64, aarch64]
fail-fast: false
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install deps
if: ${{ matrix.arch != 'x86_64' }}
run: |
dnf -y install docker
- name: Set up QEMU
if: ${{ matrix.arch != 'x86_64' }}
id: qemu
uses: docker/setup-qemu-action@v2
with:
platforms: arm64
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6 - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with: with:
bundle: goldwarden.flatpak bundle: goldwarden.flatpak
manifest-path: com.quexten.Goldwarden.yml manifest-path: com.quexten.Goldwarden.yml
cache-key: flatpak-builder-${{ github.sha }} cache-key: flatpak-builder-${{ github.sha }}
arch: ${{ matrix.arch }}

View File

@ -30,10 +30,9 @@ finish-args:
modules: modules:
- ./ui/python3-requirements.json - ./ui/python3-requirements.json
- name: wl-clipboard - name: wl-clipboard
buildsystem: simple buildsystem: meson
build-commands: config-opts:
- meson setup build && cd build && ninja - -Dfishcompletiondir=no
- install -D build/src/wl-copy /app/bin/wl-copy
sources: sources:
- type: git - type: git
url: https://github.com/bugaevc/wl-clipboard.git url: https://github.com/bugaevc/wl-clipboard.git
@ -52,8 +51,17 @@ modules:
- name: goldwarden-core-daemon - name: goldwarden-core-daemon
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- install -D goldwarden_linux_x86_64 /app/bin/goldwarden - install -D goldwarden_linux_* /app/bin/goldwarden
sources: sources:
- type: file - type: file
url: https://github.com/quexten/goldwarden/releases/download/v0.2.5/goldwarden_linux_x86_64 url: https://github.com/quexten/goldwarden/releases/download/v0.2.5/goldwarden_linux_x86_64
sha256: 8854594e40516b01d3647c5bd0085442b4c31f715b6c53db91748f0456fa5f2a sha256: 8854594e40516b01d3647c5bd0085442b4c31f715b6c53db91748f0456fa5f2a
only-arches: [x86_64]
- type: file
url: https://github.com/quexten/goldwarden/releases/download/v0.2.5/goldwarden_linux_arm64
sha256: 30d3b8ece22557d82ec21aa7b01cfd5b0b50ff489868a4d4ec71d57bf8c4d8c1
only-arches: [aarch64]
- type: file
url: https://github.com/quexten/goldwarden/releases/download/v0.2.5/goldwarden_linux_x86
sha256: e1166098f46c4947d176714318c40a96930626c149d73e511ea6ca75099acfbc
only-arches: [i386]