Skip to content

Commit

Permalink
Merge pull request #79 from SubhadeepJasu/flatpak-release
Browse files Browse the repository at this point in the history
Update release 2.0.0
  • Loading branch information
SubhadeepJasu authored Aug 2, 2021
2 parents fc7d87f + bab6cb4 commit c6e1351
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 18 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: CI

on:
pull_request:
types:
- opened
- reopened
- synchronize

jobs:
flatpak:
name: Flatpak
runs-on: ubuntu-latest

container:
image: ghcr.io/elementary/flatpak-platform/runtime:daily
options: --privileged

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

- name: Build
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
with:
bundle: Pebbles.flatpak
manifest-path: com.github.subhadeepjasu.pebbles.yml
run-tests: true
repository-name: appcenter
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
cache-key: "flatpak-builder-${{ github.sha }}"
16 changes: 16 additions & 0 deletions .github/workflows/gettext.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Gettext updates
on:
push:
branches: main
jobs:
gettext_template:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: elementary/actions/gettext-template@master
env:
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
GIT_USER_NAME: "subhadeepjasu"
GIT_USER_EMAIL: "[email protected]"
with:
translation_branch: 'main'
26 changes: 26 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---

name: Release

on:
pull_request:
branches: main
types: closed

jobs:
create_release:
name: Create Release
runs-on: ubuntu-latest

if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')

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

- name: Release
uses: elementary/actions/release@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
release_branch: 'odin'
4 changes: 0 additions & 4 deletions .vscode/settings.json

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<br>
Pebbles is an advanced calculator application based in Vala and Gtk.

[![Build Status](https://travis-ci.com/SubhadeepJasu/pebbles.svg?branch=master)](https://travis-ci.com/SubhadeepJasu/pebbles)
![elementary flatpak build status](https://github.com/SubhadeepJasu/pebbles/actions/workflows/ci.yml/badge.svg)

## Get it from store
| elementary OS | FlatHub |
Expand Down
11 changes: 0 additions & 11 deletions com.github.subhadeepjasu.pebbles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,6 @@ modules:
- type: git
url: https://github.com/elementary/granite.git

# - name: gsl
# buildsystem: simple
# build-commands:
# - autoconf
# - ./configure
# - make
# - sudo make install
# sources:
# - type: archive
# url: https://mirror.ibcp.fr/pub/gnu/gsl/gsl-latest.tar.gz
# sha256: b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8
- name: gsl
config-opts:
- --disable-static
Expand Down
5 changes: 3 additions & 2 deletions data/com.github.subhadeepjasu.pebbles.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@
<content_attribute id="money-gambling">none</content_attribute>
</content_rating>
<releases>
<release date="2021-07-14" version="2.0.0">
<release date="2021-08-03" version="2.0.0">
<description>
<p>New:</p>
<ul>
<li>[UI] Make UI resizable and responsive with touch support</li>
<li>[UI] Follow platform-implemented dark style preference</li>
<li>[UI] Follow system-wide dark style preference</li>
<li>[UI] Updated CSS to be in tune with style of elementary OS 6 Odin</li>
</ul>
<p>Improved:</p>
<ul>
Expand Down

0 comments on commit c6e1351

Please sign in to comment.