From 206d48b29a0b5bb30b679e15740c279e418aede0 Mon Sep 17 00:00:00 2001 From: Ryo Nakano <26003928+ryonakano@users.noreply.github.com> Date: Thu, 25 Nov 2021 12:57:46 +0900 Subject: [PATCH 1/2] Replace Travis with GitHub Actions --- .github/workflows/ci.yml | 36 ++++++++++++++++++++++++++++++++++++ .travis.yml | 27 --------------------------- 2 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100755 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..b4bb0fbd --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,36 @@ +name: CI + +on: [pull_request] + +jobs: + deploy_flatpak: + name: Deploy Flatpak + runs-on: ubuntu-latest + + container: + image: ghcr.io/elementary/flatpak-platform/runtime:6 + options: --privileged + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Build + uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 + with: + bundle: easyssh.flatpak + manifest-path: com.github.muriloventuroso.easyssh.yml + run-tests: true + repository-name: appcenter + repository-url: https://flatpak.elementary.io/repo.flatpakrepo + cache-key: "flatpak-builder-${{ github.sha }}" + + lint: + name: Lint + runs-on: ubuntu-latest + container: + image: valalang/lint + steps: + - uses: actions/checkout@v2 + - name: Lint + run: io.elementary.vala-lint -d . diff --git a/.travis.yml b/.travis.yml deleted file mode 100755 index 82560273..00000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- - -language: node_js - -node_js: - - 10/* - -sudo: required - -services: - - docker - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - libstdc++-5-dev - -install: - - npm i -g @elementaryos/houston - -script: - - houston ci - --type system-app - --name-domain com.github.muriloventuroso.easyssh - --name-human EasySSH From 29161cbb32e49b9da3a9006f6e1ec69226c9cdf5 Mon Sep 17 00:00:00 2001 From: Ryo Nakano <26003928+ryonakano@users.noreply.github.com> Date: Thu, 25 Nov 2021 13:11:14 +0900 Subject: [PATCH 2/2] Add ARM builds --- .github/workflows/ci.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4bb0fbd..03b86a4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,29 +3,41 @@ name: CI on: [pull_request] jobs: - deploy_flatpak: - name: Deploy Flatpak + Flatpak: runs-on: ubuntu-latest + strategy: + matrix: + arch: [x86_64, aarch64] + # Don't fail the whole workflow if one architecture fails + fail-fast: false + container: - image: ghcr.io/elementary/flatpak-platform/runtime:6 + image: ghcr.io/elementary/flatpak-platform/runtime:6-${{ matrix.arch }} options: --privileged steps: - name: Checkout uses: actions/checkout@v2 + - name: Set up QEMU for aarch64 emulation + if: ${{ matrix.arch != 'x86_64' }} + uses: docker/setup-qemu-action@v1 + with: + platforms: arm64 + - name: Build uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 with: bundle: easyssh.flatpak - manifest-path: com.github.muriloventuroso.easyssh.yml + manifest-path: com.github.muriloventuroso.easyssh.yml.yml run-tests: true repository-name: appcenter repository-url: https://flatpak.elementary.io/repo.flatpakrepo cache-key: "flatpak-builder-${{ github.sha }}" + arch: ${{ matrix.arch }} - lint: + Lint: name: Lint runs-on: ubuntu-latest container: