Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
plfiorini committed Nov 10, 2023
2 parents dacbdf6 + 24ba0a4 commit f28d059
Show file tree
Hide file tree
Showing 1,906 changed files with 4,509 additions and 1,631 deletions.
37 changes: 0 additions & 37 deletions .appveyor.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
.gitignore export-ignore
.gitattributes export-ignore
.gitmodules export-ignore
.github export-ignore
.travis export-ignore
.travis.yml export-ignore
.tx export-ignore
.mailmap export-ignore
125 changes: 125 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
name: CI

on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop

env:
CLAZY_CHECKS: "level1"

jobs:
linux:
if: "!contains(github.event.head_commit.message, 'ci skip')"
strategy:
matrix:
compiler:
- gcc
- clang
container:
- suse-qt515
runs-on: ubuntu-latest
container:
image: liridev/${{ matrix.container }}
steps:
- name: Extract branch name
id: extract_branch
shell: bash
run: |
if [ -n "${{ github.base_ref }}" ]; then
echo "##[set-output name=branch;]${{ github.base_ref }}"
else
github_ref=${{ github.ref }}
echo "##[set-output name=branch;]${github_ref##*/}"
fi
- name: Qt version identifier
id: qt_version
shell: bash
run: |
qtverid=`echo "${{ matrix.container }}" | sed -e 's,suse-qt,,g'`
echo "##[set-output name=id;]${qtverid}"
- uses: actions/checkout@v2
- name: Build dependencies
run: |
set -x
./.github/workflows/scripts/build-deps ${{ steps.extract_branch.outputs.branch }}
- name: Build
run: |
set -x
mkdir -p build
cd build
# OpenSuSE containers don't have any documentation
if [ "${{ matrix.compiler }}" == "clang" ]; then
export CC=clang
export CXX=clang++
cmake .. -DLIRI_ENABLE_CLAZY:BOOL=ON -DCMAKE_INSTALL_PREFIX=/usr -DFLUID_WITH_DOCUMENTATION:BOOL=OFF
else
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DFLUID_WITH_DOCUMENTATION:BOOL=OFF
fi
make -j $(getconf _NPROCESSORS_ONLN)
sudo make install
- name: Test
run: |
set -x
cd build
dbus-run-session -- xvfb-run -a -s "-screen 0 800x600x24" ctest -V
# Build documentation under Ubuntu
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Install dependencies
run: |
set -x
wget -qO - 'http://archive.neon.kde.org/public.key' | sudo apt-key add -
sudo apt-add-repository http://archive.neon.kde.org/user
sudo apt-get update -y
sudo apt-get install -y qtbase5-dev qtdeclarative5-dev qtquickcontrols2-5-dev qttools5-dev libqt5svg5-dev qdoc-qt5 qt5-doc qtbase5-doc
- name: Build
run: |
set -x
mkdir -p build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DFLUID_WITH_DOCUMENTATION:BOOL=ON -DFLUID_WITH_DEMO:BOOL=OFF -DFLUID_WITH_QML_MODULES:BOOL=OFF -DFLUID_INSTALL_ICONS:BOOL=OFF
make -j $(getconf _NPROCESSORS_ONLN)
sudo make install
windows:
if: "!contains(github.event.head_commit.message, 'ci skip')"
strategy:
matrix:
compiler:
- win32_msvc2017
qt:
- 5.12.8
runs-on: windows-2016
steps:
- name: Cache Qt
id: cache-qt
uses: actions/cache@v1
with:
path: ../Qt
key: ${{ runner.os }}-QtCache-${{ matrix.qt }}
- name: Install Qt
uses: jurplel/install-qt-action@v2
with:
version: ${{ matrix.qt }}
arch: ${{ matrix.compiler }}
cached: ${{ steps.cache-qt.outputs.cache-hit }}
- uses: actions/checkout@v2
with:
submodules: true
- name: Build
run: |
mkdir build
cd build
cmake .. -DFLUID_WITH_DOCUMENTATION:BOOL=OFF
cmake --build .
46 changes: 46 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Checks

on:
push:
branches:
- master
- develop
tags:
- v*
pull_request:
types:
- opened
- synchronize
- reopened
- edited

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
wip:
if: "!contains(github.event.head_commit.message, 'ci skip') && github.event_name == 'pull_request'"
runs-on: ubuntu-latest
steps:
- name: Work in progress
uses: wip/action@master
xdg:
if: "!contains(github.event.head_commit.message, 'ci skip')"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Validate XDG files
uses: liri-infra/xdg-validator-action@master
with:
strict: false
qml:
if: "!contains(github.event.head_commit.message, 'ci skip')"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Validate QML and JavaScript files
uses: liri-infra/qmllint-action@master
14 changes: 14 additions & 0 deletions .github/workflows/copr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: COPR

on:
push:
branches:
- develop

jobs:
copr:
if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'copr skip')"
runs-on: ubuntu-latest
steps:
- name: Rebuild package
run: curl -X POST ${{ secrets.COPR_WEBHOOK_URL }}
24 changes: 24 additions & 0 deletions .github/workflows/scripts/build-deps
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash

# SPDX-FileCopyrightText: 2021 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
#
# SPDX-License-Identifier: BSD-3-Clause

set -e

branch=$1

if [ -z "$branch" ]; then
echo "Usage: $0 [branch]"
exit 1
fi

curdir=$(dirname `readlink -f $0`)

mkdir -p /tmp/build-deps
pushd /tmp/build-deps
git clone git://github.com/liri-infra/ci-scripts
for repo in cmake-shared; do
./ci-scripts/build-liri $repo $branch
done
popd
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build/
material-design-icons/
*.user
*.qmlc
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "qbs-shared"]
path = qbs/shared
url = git://github.com/lirios/qbs-shared
url = https://github.com/lirios/qbs-shared
branch = master
[submodule "cmake-shared"]
path = cmake/shared
url = git://github.com/lirios/cmake-shared
url = https://github.com/lirios/cmake-shared
branch = develop
43 changes: 0 additions & 43 deletions .travis.yml

This file was deleted.

76 changes: 0 additions & 76 deletions .travis/build.sh

This file was deleted.

Loading

0 comments on commit f28d059

Please sign in to comment.