Skip to content

Commit f9afa45

Browse files
authored
Merge branch 'master' into feat/appimage-updater
2 parents 0ec25c2 + beb7055 commit f9afa45

240 files changed

Lines changed: 32602 additions & 8716 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/linux-appimage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
2525
- name: Upload AppImage artifact
2626
id: upload-appimage
27-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
27+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
2828
with:
2929
name: nextcloud-appimage-pr-${{ github.event.number }}
3030
path: ${{ steps.build-appimage.outputs.APPIMAGE_NAME }}

.github/workflows/macos-build-and-test.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,20 @@ jobs:
2626
build:
2727
name: Build nextcloud-client
2828
timeout-minutes: 60
29-
runs-on: macos-15
29+
runs-on: macos-latest
3030
steps:
3131
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3232
with:
3333
fetch-depth: 1
3434

35-
- name: List Xcode installations
36-
run: sudo ls -1 /Applications | grep "Xcode"
37-
38-
- name: Select Xcode 16.3
39-
run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
40-
35+
- name: Setup Xcode
36+
uses: maxim-lobanov/setup-xcode@v1
37+
with:
38+
xcode-version: latest-stable
39+
40+
- name: Show Swift version
41+
run: swift --version
42+
4143
- name: Set up Python ${{ inputs.PYTHON_VERSION }}
4244
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
4345
with:
@@ -48,7 +50,7 @@ jobs:
4850
brew install homebrew/cask/inkscape
4951
5052
- name: Restore cached Craft directories
51-
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
53+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
5254
with:
5355
path: |
5456
${{ inputs.CRAFT_MASTER_LOCATION }}
@@ -61,7 +63,7 @@ jobs:
6163
python "${{ inputs.CRAFT_MASTER_LOCATION }}/CraftMaster.py" --config "${{ inputs.CRAFT_MASTER_CONFIG }}" --target ${{ inputs.CRAFT_TARGET }} -c --options nextcloud-client.srcDir=${{ github.workspace }} --options nextcloud-client.buildFileProviderModule=${{ inputs.buildFileProviderModule }} nextcloud-client
6264
6365
- name: Cache Craft directories containing the built client
64-
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
66+
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
6567
with:
6668
path: |
6769
${{ inputs.CRAFT_MASTER_LOCATION }}
@@ -74,10 +76,10 @@ jobs:
7476
name: Run tests
7577
needs: build
7678
timeout-minutes: 60
77-
runs-on: macos-15
79+
runs-on: macos-latest
7880
steps:
7981
- name: Restore cached Craft directories containing the built client
80-
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
82+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
8183
with:
8284
path: |
8385
${{ inputs.CRAFT_MASTER_LOCATION }}

.github/workflows/macos-craft-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Discover cached Craft directories
3232
id: cache-craft-restore
33-
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
33+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
3434
with:
3535
path: |
3636
${{ env.CRAFT_MASTER_LOCATION }}
@@ -81,7 +81,7 @@ jobs:
8181
8282
- name: Cache Craft directories
8383
if: steps.cache-craft-restore.outputs.cache-hit != 'true'
84-
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
84+
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
8585
with:
8686
path: |
8787
${{ env.CRAFT_MASTER_LOCATION }}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-FileCopyrightText: Nextcloud GmbH
2+
# SPDX-FileCopyrightText: 2025 Iva Horn
3+
# SPDX-License-Identifier: LGPL-3.0-or-later
4+
5+
name: NextcloudFileProviderKit
6+
7+
on:
8+
push:
9+
branches: [ "master" ]
10+
pull_request:
11+
branches: [ "master" ]
12+
13+
jobs:
14+
Lint:
15+
runs-on: macos-latest
16+
17+
defaults:
18+
run:
19+
working-directory: shell_integration/MacOSX/NextcloudFileProviderKit
20+
21+
steps:
22+
- uses: actions/checkout@v4
23+
24+
- name: SwiftFormat
25+
run: swiftformat --lint . --reporter github-actions-log
26+
27+
Tests:
28+
runs-on: macos-latest
29+
30+
defaults:
31+
run:
32+
working-directory: shell_integration/MacOSX/NextcloudFileProviderKit
33+
34+
steps:
35+
- uses: actions/checkout@v4
36+
37+
- uses: maxim-lobanov/setup-xcode@v1
38+
with:
39+
xcode-version: latest-stable
40+
41+
- name: Run Tests
42+
run: xcodebuild clean build test -scheme NextcloudFileProviderKit -destination "platform=macOS,name=My Mac"

.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
1919

2020
- name: Restore cache
21-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
21+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
2222
with:
2323
path: /cache
2424
key: ${{ runner.os }}

.github/workflows/windows-build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
3939
- name: Cache Install OpenCppCoverage
4040
id: cache-install-opencppcoverage
41-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
41+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
4242
with:
4343
path: C:\Program Files\OpenCppCoverage
4444
key: ${{ runner.os }}-cache-install-opencppcoverage
@@ -51,7 +51,7 @@ jobs:
5151
5252
#- name: Cache Install inkscape
5353
# id: cache-install-inkscape
54-
# uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
54+
# uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
5555
# with:
5656
# path: C:\Program Files\inkscape
5757
# key: ${{ runner.os }}-cache-install-inkscape

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,6 @@ if(OWNCLOUD_5XX_NO_BLACKLIST)
237237
add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
238238
endif()
239239

240-
if(APPLE)
241-
set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
242-
endif()
243-
244240
if(BUILD_CLIENT)
245241
OPTION(GUI_TESTING "Build with gui introspection features of socket api" OFF)
246242

NEXTCLOUD.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ set( APPLICATION_ICON_SET "SVG" )
3131
set( APPLICATION_SERVER_URL "" CACHE STRING "URL for the server to use. If entered, the UI field will be pre-filled with it" )
3232
set( APPLICATION_SERVER_URL_ENFORCE ON ) # If set and APPLICATION_SERVER_URL is defined, the server can only connect to the pre-defined URL
3333
set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
34+
set( DEVELOPMENT_TEAM "NKUJUXUJ3B" CACHE STRING "Apple Development Team ID for code signing" )
3435
set( APPLICATION_VIRTUALFILE_SUFFIX "nextcloud" CACHE STRING "Virtual file suffix (not including the .)")
3536
set( APPLICATION_OCSP_STAPLING_ENABLED OFF )
3637
set( APPLICATION_FORBID_BAD_SSL OFF )

REUSE.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ SPDX-License-Identifier = "GPL-2.0-or-later"
3131

3232
[[annotations]]
3333
path = [
34+
"admin/osx/container-migration.plist.cmake",
3435
"admin/osx/TransifexStringCatalogSanitizer/Package.swift",
3536
"admin/osx/TransifexStringCatalogSanitizer/Package.resolved",
3637
"admin/osx/TransifexStringCatalogSanitizer/README.md",

admin/osx/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ else()
2121
set(DEBUG_ENTITLEMENTS "")
2222
endif()
2323

24+
# Sandbox migration description
25+
configure_file(container-migration.plist.cmake ${CMAKE_CURRENT_BINARY_DIR}/container-migration.plist @ONLY)
26+
install(FILES ${CMAKE_BINARY_DIR}/admin/osx/container-migration.plist
27+
DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources)
28+
2429
configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
2530
configure_file(macosx.entitlements.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.entitlements)
2631
configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)

0 commit comments

Comments
 (0)