Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flux #45

Draft
wants to merge 42 commits into
base: master
Choose a base branch
from
Draft

Flux #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ac70459
Fix compilation error
meisenzahl Mar 8, 2021
76c612e
Use libhandy
meisenzahl Mar 8, 2021
5778a8e
Add support for dark mode
meisenzahl Mar 8, 2021
54ce5e9
Use Granite style classes
meisenzahl Mar 8, 2021
efc9bda
Satisfy linter
meisenzahl Mar 8, 2021
f2b8679
Delete Travis CI
meisenzahl Apr 1, 2021
5740208
Add Flatpak manifest
meisenzahl Apr 1, 2021
0f8e89b
Delete debian packaging
meisenzahl Apr 1, 2021
b75ec3a
Add Flux dependency
meisenzahl Apr 1, 2021
ab04f96
Merge branch 'master' into flux
meisenzahl Apr 1, 2021
a33c2a4
Build with GitHub CI
meisenzahl Apr 1, 2021
d9a4574
Add intial files
meisenzahl Apr 1, 2021
559bf32
Delete subproject
meisenzahl Apr 1, 2021
fb6ec3e
Delete subproject
meisenzahl Apr 1, 2021
cc7b5af
Update .gitignore
meisenzahl Apr 1, 2021
6e8bfb7
Install git
meisenzahl Apr 1, 2021
34e8b03
Install git
meisenzahl Apr 1, 2021
4952794
Add git
meisenzahl Apr 1, 2021
3959616
Update
meisenzahl Apr 1, 2021
9120228
Add Hue actions
meisenzahl Apr 1, 2021
af0d435
Add middlewares
meisenzahl Apr 1, 2021
4bfeb39
Add more Flux actions
meisenzahl Apr 1, 2021
026a32d
Process devices in Store
meisenzahl Apr 1, 2021
2dfce31
Update Flatpak manifest
meisenzahl Apr 15, 2021
a493dfe
Update GitHub CI
meisenzahl Apr 15, 2021
58f1e2b
Update README.md
meisenzahl Apr 15, 2021
968d140
Use RDNN
meisenzahl Apr 15, 2021
a8ad934
Use daily as runtime-version
meisenzahl Apr 19, 2021
e0f31d8
Update main.yml
meisenzahl Apr 29, 2021
b492896
Update runtime version
meisenzahl Jul 26, 2021
51ee194
Add stripe key
meisenzahl Jul 26, 2021
57c5077
Update stripe key
meisenzahl Jul 26, 2021
68a343b
Update AppCenter colors
meisenzahl Aug 14, 2021
83df1fe
Merge branch 'master' into odin
meisenzahl Nov 20, 2021
2d74b83
Fix icon
meisenzahl Nov 20, 2021
f4eb8ef
Improve tooling
meisenzahl Nov 20, 2021
4c7fea4
Update .gitignore
meisenzahl Nov 20, 2021
9baccce
MainWindow: Remove WindowHandle
meisenzahl Nov 20, 2021
727c097
GitHub CI: Add build for ARM
meisenzahl Nov 20, 2021
8bc0c43
Add gettext domain
meisenzahl Nov 20, 2021
22d171e
Merge branch 'odin' into flux
meisenzahl Nov 20, 2021
952d285
Set default values
meisenzahl Nov 20, 2021
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
58 changes: 58 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: CI

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

jobs:
flatpak:
name: 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-${{ 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: com.github.manexim.home.flatpak
manifest-path: com.github.manexim.home.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:
name: Lint
runs-on: ubuntu-latest

container:
image: valalang/lint

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

- name: Lint
run: io.elementary.vala-lint -d .
16 changes: 0 additions & 16 deletions .github/workflows/main.yml

This file was deleted.

8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
*~
build/
src/Application
build
build-dir
.flatpak-builder
repo/
*.flatpak
subprojects/flux/
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "Build & Run",
"type": "shell",
"command": "./app build && ./app install && ./app run",
"problemMatcher": [],
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</p>

<p align="center">
<a href="https://travis-ci.org/manexim/home">
<img src="https://img.shields.io/travis/manexim/home.svg">
<a href="https://github.com/manexim/home/actions/workflows/main.yml">
<img src="https://github.com/manexim/home/workflows/CI/badge.svg">
</a>
<a href="https://github.com/manexim/home/releases/">
<img src="https://img.shields.io/github/release/manexim/home.svg">
Expand Down Expand Up @@ -73,6 +73,7 @@ These dependencies must be present before building:
- `meson (>=0.40)`
- `valac (>=0.40)`
- `libgtk-3-dev`
- `libhandy-1-dev` >=1.0.0
- `libjson-glib-dev`
- `libgee-0.8-dev`
- `libgranite-dev`
Expand Down
19 changes: 19 additions & 0 deletions app
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

# fail on first error
set -e

APP=com.github.manexim.home

case "$1" in
build)
flatpak-builder --repo=repo build ${APP}.yml --force-clean
flatpak build-bundle repo ${APP}.flatpak --runtime-repo=https://flatpak.elementary.io/repo.flatpakrepo ${APP} master
;;
install)
flatpak install --user -y ${APP}.flatpak
;;
run)
flatpak run ${APP}
;;
esac
19 changes: 19 additions & 0 deletions com.github.manexim.home.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
app-id: com.github.manexim.home
runtime: io.elementary.Platform
runtime-version: '6'
sdk: io.elementary.Sdk
command: com.github.manexim.home
finish-args:
- '--share=ipc'
- '--share=network'
- '--socket=fallback-x11'
- '--socket=wayland'

# needed for perfers-color-scheme
- '--system-talk-name=org.freedesktop.Accounts'
modules:
- name: home
buildsystem: meson
sources:
- type: dir
path: .
5 changes: 3 additions & 2 deletions data/com.github.manexim.home.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,11 @@
<url type="bugtracker">https://github.com/manexim/home/issues</url>
<custom>
<!-- elementary AppCenter specific values -->
<value key="x-appcenter-color-primary">#fafafa</value>
<value key="x-appcenter-color-primary-text">#333</value>
<value key="x-appcenter-color-primary">#802392</value>
<value key="x-appcenter-color-primary-text">#fafafa</value>
<!-- Suggested price in USD; just a suggestion, NOT a minimum. -->
<value key="x-appcenter-suggested-price">5</value>
<value key="x-appcenter-stripe">pk_live_FiCVZObTHO7IaLtSXRETuJiJ00aW6Su9kN</value>
</custom>
<content_rating type="oars-1.1">
<content_attribute id="violence-cartoon">none</content_attribute>
Expand Down
124 changes: 25 additions & 99 deletions data/icons/symbolic/com.github.manexim.home.logo.lifx-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading