Skip to content

Commit

Permalink
Merge branch 'master' into improve-close-tab
Browse files Browse the repository at this point in the history
  • Loading branch information
zeebok authored Mar 7, 2025
2 parents 2920bec + 3346c82 commit eeb391a
Show file tree
Hide file tree
Showing 606 changed files with 16,088 additions and 14,110 deletions.
20 changes: 9 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,37 +32,35 @@ jobs:
flatpak:
name: Flatpak
runs-on: ubuntu-latest
runs-on: ${{ matrix.configuration.runs-on }}

strategy:
matrix:
arch: [x86_64, aarch64]
configuration:
- arch: x86_64
runs-on: ubuntu-latest
- arch: aarch64
runs-on: ubuntu-24.04-arm
# Don't fail the whole workflow if one architecture fails
fail-fast: false

container:
image: ghcr.io/elementary/flatpak-platform/runtime:7.1-${{ matrix.arch }}
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
options: --privileged

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU for aarch64 emulation
if: ${{ matrix.arch != 'x86_64' }}
uses: docker/setup-qemu-action@v3
with:
platforms: arm64

- name: Build
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
uses: flatpak/flatpak-github-actions/flatpak-builder@v6.4
with:
bundle: code.flatpak
manifest-path: io.elementary.code.yml
repository-name: appcenter
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
cache-key: "flatpak-builder-${{ github.sha }}"
arch: ${{ matrix.arch }}
arch: ${{ matrix.configuration.arch }}

lint:
name: Lint
Expand Down
1 change: 1 addition & 0 deletions po/POTFILES
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ src/FolderManager/Item.vala
src/FolderManager/ProjectFolderItem.vala
src/Services/Document.vala
src/Services/FileHandler.vala
src/Services/MonitoredRepository.vala
src/Services/PluginManager.vala
src/Services/Settings.vala
src/Services/TemplateManager.vala
Expand Down
Loading

0 comments on commit eeb391a

Please sign in to comment.