Skip to content

Commit

Permalink
Merge branch 'dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
stsdc authored Oct 13, 2024
2 parents 4a3d256 + 58789e8 commit 09969a7
Show file tree
Hide file tree
Showing 464 changed files with 155,085 additions and 4,793 deletions.
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# EditorConfig <https://EditorConfig.org>
root = true

# elementary defaults
[*]
charset = utf-8
end_of_line = lf
indent_size = tab
indent_style = space
insert_final_newline = true
max_line_length = 80
tab_width = 4

# Markup files
[{*.html,*.xml,*.xml.in,*.yml}]
tab_width = 2
1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

50 changes: 50 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: CI

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

jobs:
build:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
version: [stable, unstable, development-target]
container:
image: ghcr.io/elementary/docker:${{ matrix.version }}

steps:
- uses: actions/checkout@v4
with:
submodules: true

- name: Install Dependencies
run: |
apt update
apt install -y libgala-dev libgee-0.8-dev libglib2.0-dev libgranite-dev libgtk-3-dev libhandy-1-dev \
libdbus-glib-1-dev libwnck-3-dev libgtop2-dev libwingpanel-3.0-dev libudisks2-dev \
libxnvctrl0 libxnvctrl-dev libcurl4-gnutls-dev libflatpak-dev libjson-glib-dev \
meson valac sassc git
- name: Build
run: |
meson setup build
meson compile -C build
# Tests disabled since it starts to test live-chart and some tests fail there
# meson test -C build --print-errorlogs
meson install -C build
lint:
runs-on: ubuntu-latest

container:
image: valalang/lint

steps:
- uses: actions/checkout@v4
- name: Lint
run: io.elementary.vala-lint -d .
24 changes: 24 additions & 0 deletions .github/workflows/gettext.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Gettext Updates

on:
push:
branches: [dev]

jobs:
build:
runs-on: ubuntu-22.04
container:
image: ghcr.io/elementary/docker:next-unstable

steps:
- name: Clone repository
uses: actions/checkout@v4
with:
token: ${{ secrets.GIT_USER_TOKEN }}
submodules: true
- name: Update Translation Files
uses: elementary/actions/gettext-template@main
env:
GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
GIT_USER_NAME: "elementaryBot"
GIT_USER_EMAIL: "[email protected]"
17 changes: 0 additions & 17 deletions .github/workflows/lint.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/main.yml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/publish-copr.yml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/publish-launchpad.yml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Release
on:
pull_request:
branches: [ dev ]
types: closed
jobs:
release:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: elementary/actions/release@main
env:
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
GIT_USER_NAME: "elementaryBot"
GIT_USER_EMAIL: "[email protected]"
with:
release_branch: 'noble'
24 changes: 3 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,12 @@

<h4 align="left">Manage processes and monitor system resources</h4>

<p align="left">
<a href="https://github.com/stsdc/monitor/releases">
<img src="https://img.shields.io/github/release/stsdc/monitor.svg" alt="Release">
</a>
<img alt="GitHub Workflow Status" src="https://github.com/stsdc/monitor/actions/workflows/main.yml/badge.svg">
<a href="https://copr.fedorainfracloud.org/coprs/stsdc/monitor/package/com.github.stsdc.monitor/"><img src="https://copr.fedorainfracloud.org/coprs/stsdc/monitor/package/com.github.stsdc.monitor/status_image/last_build.png" /></a>
<a href="https://github.com/stsdc/monitor/blob/master/LICENSE">
<img src="https://img.shields.io/github/license/stsdc/monitor.svg">
</a>
</p>
[![](https://img.shields.io/github/release/stsdc/monitor.svg)]()
[![Github Workflow Status](https://github.com/stsdc/monitor/actions/workflows/ci.yml/badge.svg)]()
[![Translation status](https://l10n.elementary.io/widget/desktop/monitor/svg-badge.svg)](https://l10n.elementary.io/engage/desktop/)

![Monitor Screenshot](https://github.com/stsdc/monitor/raw/dev/data/screenshots/monitor-processes.png)
![Monitor Screenshot](https://github.com/stsdc/monitor/raw/dev/data/screenshots/monitor-system.png)
![Monitor Screenshot](https://github.com/stsdc/monitor/raw/dev/data/screenshots/monitor-containers.png)

## Install

Expand All @@ -39,16 +31,6 @@ sudo apt install com.github.stsdc.monitor

Monitor will be available from the Applications menu.

### ~~Fedora (36)~~

> [!WARNING]
> Dropped support due to lack of Pantheon dependencies on COPR.
```bash
sudo dnf copr enable stsdc/monitor
sudo dnf install com.github.stsdc.monitor
```

## Development

### Install dependencies
Expand Down
Loading

0 comments on commit 09969a7

Please sign in to comment.