From 1862cc47f4db3349bd267406f413650f9dc15c9e Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Tue, 26 Apr 2022 19:32:20 +0200 Subject: [PATCH 1/3] Add SailJail permissions --- harbour-papocchio.desktop | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/harbour-papocchio.desktop b/harbour-papocchio.desktop index 777fb28..2ae1ffd 100644 --- a/harbour-papocchio.desktop +++ b/harbour-papocchio.desktop @@ -6,3 +6,8 @@ Icon=harbour-papocchio Exec=harbour-papocchio Name=Papocchio Comment=Draw using your finger! + +[X-Sailjail] +Permissions=Pictures +OrganizationName=it.andreascarpino +ApplicationName=harbour-papocchio From 17bb5e8815b5a3c8666024086c16c84ae4940ab9 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Mon, 2 May 2022 23:24:39 +0200 Subject: [PATCH 2/3] Fix icons generation --- Papocchio.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Papocchio.pro b/Papocchio.pro index ad0521f..b05f8bd 100644 --- a/Papocchio.pro +++ b/Papocchio.pro @@ -2,6 +2,8 @@ TARGET = harbour-papocchio CONFIG += sailfishapp +SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172 + SOURCES += \ src/main.cpp From c8aa56d1bb72e3044da0e8d3048cecdc74b6b56d Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Thu, 24 Nov 2022 22:57:33 +0100 Subject: [PATCH 3/3] Move to GitHub --- .github/FUNDING.yml | 1 + .github/workflows/build.yml | 61 +++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 64 ------------------------------------- README.md | 3 +- rpm/harbour-papocchio.spec | 12 +++---- rpm/harbour-papocchio.yaml | 12 +++---- 6 files changed, 75 insertions(+), 78 deletions(-) create mode 100644 .github/FUNDING.yml create mode 100644 .github/workflows/build.yml delete mode 100644 .gitlab-ci.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..bab60d6 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +liberapay: ilpianista diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..dc419cb --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,61 @@ +name: SailfishOS build + +on: + push: + branches: + - master + tags: + - '*' + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Prepare + run: mkdir output + + - name: Build armv7hl + id: build_armv7hl + uses: coderus/github-sfos-build@master + with: + release: 4.4.0.58 + + - name: Build i486 + id: build_i486 + uses: coderus/github-sfos-build@master + with: + release: 4.4.0.58 + arch: i486 + + - name: Build i486 + id: build_aarch64 + uses: coderus/github-sfos-build@master + with: + release: 4.4.0.58 + arch: aarch64 + + - name: Upload build result + uses: actions/upload-artifact@v2 + with: + name: rpms + path: RPMS + + - name: Create release + if: contains(github.ref, 'release') + run: | + set -x + assets=() + for asset in RPMS/*.rpm; do + assets+=("-a" "$asset") + done + tag_name="${GITHUB_REF##*/}" + hub release create "${assets[@]}" -m "$tag_name" "$tag_name" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 71d1b72..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,64 +0,0 @@ -stages: - - build - - test - - publish - -.build: - stage: build - variables: - ARCH: armv7hl - SFOS_VERSION: "3.4.0.24" - image: coderus/sailfishos-platform-sdk:${SFOS_VERSION} - artifacts: - paths: - - "output/*" - script: - - mkdir output - - mkdir ~/build - - cp -r * ~/build - - pushd ~/build - - mb2 -t SailfishOS-$SFOS_VERSION-$ARCH build - - popd - - cp -v ~/build/RPMS/* output - only: - - merge_requests - - tags - -build_armv7hl: - extends: .build - -build_i486: - extends: .build - variables: - ARCH: i486 - -build_aarch64: - extends: .build - variables: - ARCH: aarch64 - -test:validate-rpms: - stage: test - image: registry.gitlab.com/whisperfish/sailo-rs/rpm-validator:latest - allow_failure: true - needs: - - build_armv7hl - - build_i486 - - build_aarch64 - script: - - rpmvalidation.sh output/*.rpm - only: - - merge_requests - - tags - -publish: - image: inetprocess/gitlab-release - stage: publish - needs: - - build_armv7hl - - build_i486 - - build_aarch64 - only: - - tags - script: - - gitlab-release --message 'Release $CI_COMMIT_TAG' output/* diff --git a/README.md b/README.md index 1379b6b..dec2753 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ A free-hand draw application for [Sailfish OS](https://sailfishos.org). -[![Build Status](https://gitlab.com/ilpianista/harbour-Papocchio/badges/master/pipeline.svg)](https://gitlab.com/ilpianista/harbour-Papocchio/pipelines) - ## Translations [![Translation status](https://hosted.weblate.org/widgets/harbour-papocchio/-/svg-badge.svg)](https://hosted.weblate.org/engage/harbour-papocchio/?utm_source=widget) @@ -11,6 +9,7 @@ A free-hand draw application for [Sailfish OS](https://sailfishos.org). Translations via [Weblate](https://hosted.weblate.org/projects/harbour-papocchio/), thank you! ## Icon + The icon has been taken from [ICONSDB](http://www.iconsdb.com/royal-blue-icons/edit-5-icon.html). ## Donate diff --git a/rpm/harbour-papocchio.spec b/rpm/harbour-papocchio.spec index 7c4253d..50e9a7d 100644 --- a/rpm/harbour-papocchio.spec +++ b/rpm/harbour-papocchio.spec @@ -37,14 +37,14 @@ DeveloperName: Andrea Scarpino Categories: - Graphics Custom: - Repo: https://gitlab.com/ilpianista/harbour-Papocchio -Icon: https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/icons/harbour-papocchio.svg + Repo: https://github.com/ilpianista/harbour-Papocchio +Icon: https://github.com/ilpianista/harbour-Papocchio/-/raw/master/icons/harbour-papocchio.svg Screenshots: - - https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_1.png - - https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_2.png + - https://github.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_1.png + - https://github.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_2.png Url: - Homepage: https://gitlab.com/ilpianista/harbour-Papocchio - Bugtracker: https://gitlab.com/ilpianista/harbour-Papocchio/-/issues + Homepage: https://github.com/ilpianista/harbour-Papocchio + Bugtracker: https://github.com/ilpianista/harbour-Papocchio/-/issues Donation: https://paypal.me/andreascarpino %endif diff --git a/rpm/harbour-papocchio.yaml b/rpm/harbour-papocchio.yaml index fd1d35e..8f7170e 100644 --- a/rpm/harbour-papocchio.yaml +++ b/rpm/harbour-papocchio.yaml @@ -21,14 +21,14 @@ Description: | Categories: - Graphics Custom: - Repo: https://gitlab.com/ilpianista/harbour-Papocchio - Icon: https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/icons/harbour-papocchio.svg + Repo: https://github.com/ilpianista/harbour-Papocchio + Icon: https://github.com/ilpianista/harbour-Papocchio/-/raw/master/icons/harbour-papocchio.svg Screenshots: - - https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_1.png - - https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_2.png + - https://github.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_1.png + - https://github.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_2.png Url: - Homepage: https://gitlab.com/ilpianista/harbour-Papocchio - Bugtracker: https://gitlab.com/ilpianista/harbour-Papocchio/-/issues + Homepage: https://github.com/ilpianista/harbour-Papocchio + Bugtracker: https://github.com/ilpianista/harbour-Papocchio/-/issues Donation: https://paypal.me/andreascarpino %endif Configure: none