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.

Sign up for GitHub

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

Jump to bottom

Ci: Run clazy standalone #10117

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

Ci: Run clazy standalone #10117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88cbfd5
Ci: Update craft cache
TheOneRing Dec 23, 2022
f49d717
Ci: Run clazy standalone
TheOneRing Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .craft.ini
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@ ShallowClone = False
UseCache = True
CreateCache = True

ownCloudVersion = 3.0
ownCloudVersion = 4.0
# this version must match the target in the blueprint

# update MacDeploymentTarget when updating Qt
QtVersion = 5.15.5
QtVersion = kde/5.15
CachePatchLvl = 0

# set WORKSPACE to cwd, override on ci
Expand Down
201 changes: 0 additions & 201 deletions .craft.shelf
View file
Open in desktop
@@ -1,204 +1,3 @@
[General]
version = 2
blueprintrepositories = https://github.com/owncloud/craft-blueprints-owncloud.git|master|;https://invent.kde.org/packaging/craft-blueprints-kde.git|master|

[core/cacert]
version = 2022-04-26

[craft/craft-blueprints-kde]
version = master
revision = 1e62aa59

[craft/craft-blueprints-owncloud]
version = master
revision = f31b12dfb6c8b3ea137fdf2919a2e2fe6fac0730

[craft/craft-core]
version = master
revision = 3dcc29bb5

[dev-utils/7zip]
version = latest

[dev-utils/breakpad-tools]
version = cmake

[dev-utils/clazy]
version = 1.11

[dev-utils/cmake]
version = latest

[dev-utils/cmake-base]
version = 3.19.2

[dev-utils/icoutils]
version = 0.32.3

[dev-utils/jom]
version = 1_1_3

[dev-utils/kshimgen]
version = 0.4.4

[dev-utils/msys]
version = base

[dev-utils/nasm]
version = 2.15.05

[dev-utils/ninja]
version = 1.11.1

[dev-utils/patch]
version = 2.7.6

[dev-utils/perl]
version = 5.36.0

[dev-utils/pkg-config]
version = 0.29.2

[dev-utils/python2]
version = 2

[dev-utils/python3]
version = 3

[dev-utils/qtbinpatcher]
version = 2.2.0

[kde/frameworks/extra-cmake-modules]
version = 5.99.0

[kde/frameworks/tier1/syntax-highlighting]
version = 5.99.0

[libs/boost/boost-bjam]
version = 1.76.0

[libs/boost/boost-headers]
version = 1.76.0

[libs/cairo]
version = 1.16.0

[libs/d3dcompiler]
version = master

[libs/freetype]
version = 2.12.1

[libs/gettext]
version = 0.21

[libs/glib]
version = 2.68.4

[libs/harfbuzz]
version = 2.7.2

[libs/libbzip2]
version = 1.0.6

[libs/libffi]
version = 3.3

[libs/libjpeg-turbo]
version = 2.1.2

[libs/liblzma]
version = 5.2.3

[libs/libpng]
version = 1.6.37

[libs/libre-graph-api-cpp-qt-client]
version = v0.13.2

[libs/libxml2]
version = 2.9.7

[libs/libzstd]
version = 1.5.0

[libs/llvm-meta/clang]
version = 13.0.1

[libs/llvm-meta/llvm]
version = 13.0.1

[libs/openssl]
version = 1.1.1q

[libs/pcre2]
version = 10.37

[libs/pixman]
version = 0.40.0

[libs/qt5/qtbase]
version = 5.15.5

[libs/qt5/qtdeclarative]
version = 5.15.5

[libs/qt5/qtremoteobjects]
version = 5.15.5

[libs/qt5/qtscxml]
version = 5.15.5

[libs/qt5/qtsvg]
version = 5.15.5

[libs/qt5/qttools]
version = 5.15.5

[libs/qt5/qttranslations]
version = 5.15.5

[libs/qt5/qtwinextras]
version = 5.15.5

[libs/qt5/qtxmlpatterns]
version = 5.15.5

[libs/runtime]
version = 16

[libs/sqlite]
version = 3.36.0

[libs/zlib]
version = 1.2.12

[python-modules/meson]
version = master

[python-modules/pip]
version = master

[python-modules/pip-system]
version = master

[python-modules/virtualenv]
version = master

[qt-apps/gammaray]
version = 2.11.3

[qt-apps/kdstatemachineeditor]
version = 1.2.8

[qt-libs/qtkeychain]
version = 0.13.1

[virtual/base]
version = 0.2

[virtual/bin-base]
version = 0.2

[virtual/craft-blueprints-kde-base]
version = 0.1
19 changes: 9 additions & 10 deletions .github/workflows/main.yml
View file
Open in desktop
Expand Up @@ -22,16 +22,6 @@ jobs:
strategy:
matrix:
include:
- name: Windows 64-bit cl
target: windows-msvc2019_64-cl
os: windows-latest
fetch-depth: 0
container:
- name: macOS 64-bit clang
target: macos-64-clang
os: macos-latest
fetch-depth: 1
container:
- name: CentOS 7 64-bit gcc
target: linux-64-gcc
os: ubuntu-latest
Expand Down Expand Up @@ -99,6 +89,14 @@ jobs:
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --src-dir "${env:GITHUB_WORKSPACE}" owncloud/owncloud-client
}

- name: Clazy
if: ${{ matrix.target == 'linux-64-gcc' }}
run: |
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c clazy
$env:BUILD_DIR = $(& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --get buildDir -q owncloud-client)
git clone --depth=1 https://invent.kde.org/vonreth/clazy-report.git "${env:HOME}/craft/clazy-report"
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run python3 "${env:HOME}/craft/clazy-report/clazy-report.py" --src "${env:GITHUB_WORKSPACE}" --build "${env:BUILD_DIR}"

- name: Run tests
run: |
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --src-dir "${env:GITHUB_WORKSPACE}" --test owncloud/owncloud-client
Expand All @@ -119,6 +117,7 @@ jobs:
Copy-Item "$env:HOME/craft/binaries/*" "${env:GITHUB_WORKSPACE}/binaries/" -ErrorAction SilentlyContinue
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --shelve "${env:GITHUB_WORKSPACE}/.craft.shelf"
Copy-Item "${env:GITHUB_WORKSPACE}/.craft.shelf" "${env:GITHUB_WORKSPACE}/binaries/"
Copy-Item "${env:HOME}/craft/clazy-report/clazy-report.json" "${env:GITHUB_WORKSPACE}/binaries/" -ErrorAction SilentlyContinue

- name: Upload artifacts
uses: actions/upload-artifact@v2
Expand Down