Skip to content

Commit

Permalink
Merge branch 'master' into enh/handle-http-413
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
  • Loading branch information
mgallien authored Dec 20, 2023
2 parents 09be2f7 + a517197 commit 1cb6a19
Show file tree
Hide file tree
Showing 226 changed files with 19,547 additions and 6,575 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check-translations.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: "Check translations"
name: Check translations

on:
pull_request:
branches: [ master, stable-* ]
types: [opened, synchronize, reopened]

# Declare default permissions as read only.
permissions: read-all
Expand All @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3
- name: Check German
run: |
[[ $(grep "Benötigt keine Übersetzung" translations/client_de.ts -c) -gt 0 ]] && exit 1 || exit 0
4 changes: 2 additions & 2 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: cpp-linter/cpp-linter-action@v2.1.1
- uses: actions/checkout@v4
- uses: cpp-linter/cpp-linter-action@v2.7.2
id: linter
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/clang-tidy-review.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: clang-tidy-review

# You can be more specific, but it currently only works on pull requests
on: [pull_request]
on:
pull_request:
types: [opened, synchronize, reopened]

jobs:
clang-tidy:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Install clang-tidy
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/command-rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:

steps:
- name: Add reaction on start
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
repository: ${{ github.event.repository.full_name }}
comment-id: ${{ github.event.comment.id }}
reaction-type: "+1"

- name: Checkout the latest code
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0
token: ${{ secrets.COMMAND_BOT_PAT }}
Expand All @@ -42,7 +42,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}

- name: Add reaction on failure
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
if: failure()
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fixup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Block fixup and squash commits

on:
pull_request:
types: [opened, ready_for_review, reopened, synchronize]
types: [opened, synchronize, reopened]

permissions:
contents: read
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/generates_locales.yml

This file was deleted.

11 changes: 4 additions & 7 deletions .github/workflows/macos-build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
name: macOS Build and Test
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build
name: macOS Build and Test
runs-on: macos-latest
env:
CRAFT_TARGET: macos-64-clang
CRAFT_MASTER_LOCATION: ${{ github.workspace }}/CraftMaster
CRAFT_MASTER_CONFIG: ${{ github.workspace }}/craftmaster.ini
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Restore cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/cache
key: macos-latest-${{ env.CRAFT_TARGET }}

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: 3.9

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/needsinfo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
- uses: actions/stale@v9
with:
operations-per-run: 1500
days-before-stale: 28
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/qml-label-check.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
name: QML Label component check
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build
name: QML Label component check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Run label component count
run: |
MATCHESRESULT=$(find . -iname "*.qml" | xargs grep -r -e "^\s*Label\s*[{]" | wc -l | sed "s/ //g")
echo "MATCHES=${MATCHESRESULT}" >> $GITHUB_ENV
echo "EXPECTED_MATCHES=1" >> $GITHUB_ENV
- name: Check label component use count
if: env.MATCHES != env.EXPECTED_MATCHES
uses: actions/github-script@v3
uses: actions/github-script@v7
with:
script: |
core.setFailed('Using QML Labels! Make sure to use EnforcedPlainTextLabel instead!')
9 changes: 3 additions & 6 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
name: SonarCloud analysis
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build
name: SonarCloud analysis
runs-on: ubuntu-22.04
container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-14
env:
SONAR_SERVER_URL: "https://sonarcloud.io"
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Restore cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /cache
key: ${{ runner.os }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
- uses: actions/stale@v9
with:
operations-per-run: 1500
days-before-stale: 28
days-before-close: 14
days-before-pr-close: -1
only-labels: 'bug'
only-labels: 'bug,need info'
exempt-issue-labels: 'approved'
stale-issue-message: 'This bug report did not receive an update in the last 4 weeks.
Please take a look again and update the issue with new details,
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/windows-build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
name: Windows Build and Test
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build
name: Windows Build and Test
runs-on: windows-2019
env:
CRAFT_TARGET: windows-msvc2019_64-cl
COBERTURA_COVERAGE_FILE: ${{ github.workspace }}\cobertura_coverage\coverage.xml
CRAFT_MASTER_LOCATION: ${{ github.workspace }}\CraftMaster
CRAFT_MASTER_CONFIG: ${{ github.workspace }}\craftmaster.ini
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- uses: actions/setup-python@v1
- uses: actions/setup-python@v5
with:
python-version: '3.8'
- name: Install Craft Master with Nextcloud Client Deps
Expand Down
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ if(BUILD_CLIENT)
find_package(OpenSSL 1.1 REQUIRED )

find_package(ZLIB REQUIRED)
find_package(SQLite3 3.9.0 REQUIRED)

if(NOT WIN32 AND NOT APPLE)
find_package(PkgConfig REQUIRED)
Expand All @@ -227,6 +228,12 @@ if(BUILD_CLIENT)
endif()
endif()

if (APPLE)
option(BUILD_WITH_WEBENGINE "BUILD_WITH_WEBENGINE" OFF)
else ()
option(BUILD_WITH_WEBENGINE "BUILD_WITH_WEBENGINE" ON)
endif()

if (NOT DEFINED APPLICATION_ICON_NAME)
set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
endif()
Expand Down
2 changes: 1 addition & 1 deletion VERSION.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set( MIRALL_VERSION_MAJOR 3 )
set( MIRALL_VERSION_MINOR 10 )
set( MIRALL_VERSION_MINOR 11 )
set( MIRALL_VERSION_PATCH 50 )
set( MIRALL_VERSION_YEAR 2023 )
set( MIRALL_SOVERSION 0 )
Expand Down
Loading

0 comments on commit 1cb6a19

Please sign in to comment.