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
38 changes: 0 additions & 38 deletions .github/workflows/gettext.yml

This file was deleted.

78 changes: 78 additions & 0 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
---
name: Merge

on:
push:
branches:
- main

jobs:
deploy_flatpak:
name: Deploy Flatpak (${{ matrix.configuration.arch }})
runs-on: ${{ matrix.configuration.runs-on }}

strategy:
matrix:
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:8.2-${{ matrix.configuration.arch }}
options: --privileged

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

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

- name: Deploy
uses: flatpak/flatpak-github-actions/flat-manager@v6.5
with:
repository: appcenter
flat-manager-url: https://flatpak-api.elementary.io
token: ${{ secrets.FLAT_MANAGER_TOKEN }}

gettext:
name: Gettext
runs-on: ubuntu-latest
container:
image: ghcr.io/elementary/flatpak-platform/runtime:8.2-x86_64
options: --privileged

steps:
- name: Install git, python3-git and jq
run: |
apt-get update
apt-get install git jq python3-git -y

- name: Clone repository
uses: actions/checkout@v4
with:
token: ${{ secrets.GIT_USER_TOKEN }}

- name: Configure Git
run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"

- name: Update Translation Files
uses: elementary/actions/gettext-flatpak@main
with:
manifest-path: 'io.elementary.maps.yml'
env:
GIT_USER_NAME: "elementaryBot"
GIT_USER_EMAIL: "builds@elementary.io"