Skip to content

Commit 9ca5b4a

Browse files
memuratsmemurats
authored
Merge branch 'master' into nmc/master/custom_main_window
2 parents 22ae516 + 7b270aa commit 9ca5b4a

230 files changed

Lines changed: 9282 additions & 5377 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/block-unconventional-commits.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131
with:
3232
persist-credentials: false
3333

34-
- uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0
34+
- uses: webiny/action-conventional-commits@faccb24fc2550dd15c0390d944379d2d8ed9690e # v1.3.1
3535
with:
3636
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3737

‎.github/workflows/check-translations.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818
- name: Check German
1919
run: |
2020
[[ $(grep "Benötigt keine Übersetzung" translations/client_de.ts -c) -gt 0 ]] && exit 1 || exit 0
@@ -24,7 +24,7 @@ jobs:
2424
container: ghcr.io/nextcloud/continuous-integration-translations-desktop:latest
2525

2626
steps:
27-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
27+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
- name: Check Elipsis
2929
run: |
3030
lupdate -no-obsolete src/gui/ src/cmd/ src/common/ $crashreporter src/csync/ src/libsync/ $resources -ts ../ci-client.ts

‎.github/workflows/clang-format.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
build:
99
runs-on: ubuntu-22.04
1010
steps:
11-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
11+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1212
- uses: cpp-linter/cpp-linter-action@b6edc0625e3941baa1797f4b4326adeab6890c97 # v2.16.7
1313
id: linter
1414
env:

‎.github/workflows/clang-tidy-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
1313
steps:
14-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
14+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1515
with:
1616
fetch-depth: 2
1717
- name: Prepare compile_commands.json

‎.github/workflows/linux-appimage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
container: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.9.3-2
1313
steps:
14-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
14+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1515
with:
1616
fetch-depth: 1
1717

‎.github/workflows/linux-clang-compile-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-forky-6.9.2-1
1212
steps:
13-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
13+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1414
with:
1515
fetch-depth: 1
1616
- name: Configure and compile

‎.github/workflows/linux-gcc-compile-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-forky-6.9.2-1
1212
steps:
13-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
13+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1414
with:
1515
fetch-depth: 1
1616
- name: Configure and compile

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ jobs:
2828
timeout-minutes: 60
2929
runs-on: macos-latest
3030
steps:
31-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
31+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232
with:
3333
fetch-depth: 1
3434

3535
- name: Setup Xcode
36-
uses: maxim-lobanov/setup-xcode@v1
36+
uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
3737
with:
3838
xcode-version: latest-stable
3939

4040
- name: Show Swift version
4141
run: swift --version
4242

4343
- name: Set up Python ${{ inputs.PYTHON_VERSION }}
44-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
44+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
4545
with:
4646
python-version: ${{ inputs.PYTHON_VERSION }}
4747

@@ -50,7 +50,7 @@ jobs:
5050
brew install homebrew/cask/inkscape
5151
5252
- name: Restore cached Craft directories
53-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
53+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
5454
with:
5555
path: |
5656
${{ inputs.CRAFT_MASTER_LOCATION }}
@@ -63,7 +63,7 @@ jobs:
6363
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
6464
6565
- name: Cache Craft directories containing the built client
66-
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
66+
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
6767
with:
6868
path: |
6969
${{ inputs.CRAFT_MASTER_LOCATION }}
@@ -79,7 +79,7 @@ jobs:
7979
runs-on: macos-latest
8080
steps:
8181
- name: Restore cached Craft directories containing the built client
82-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
82+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
8383
with:
8484
path: |
8585
${{ inputs.CRAFT_MASTER_LOCATION }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
CRAFT_MASTER_CONFIG: ${{ env.CRAFT_MASTER_CONFIG }}
2525
PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
2626
steps:
27-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
27+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
with:
2929
fetch-depth: 1
3030

3131
- name: Discover cached Craft directories
3232
id: cache-craft-restore
33-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
33+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
3434
with:
3535
path: |
3636
${{ env.CRAFT_MASTER_LOCATION }}
@@ -49,7 +49,7 @@ jobs:
4949

5050
- name: Set up Python ${{ env.PYTHON_VERSION }}
5151
if: steps.cache-craft-restore.outputs.cache-hit != 'true'
52-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
52+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
5353
with:
5454
python-version: ${{ env.PYTHON_VERSION }}
5555

@@ -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@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
84+
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
8585
with:
8686
path: |
8787
${{ env.CRAFT_MASTER_LOCATION }}

‎.github/workflows/nextcloudfileproviderkit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
working-directory: shell_integration/MacOSX/NextcloudFileProviderKit
2020

2121
steps:
22-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323

2424
- name: SwiftFormat
2525
run: swiftformat --lint . --reporter github-actions-log
@@ -32,7 +32,7 @@ jobs:
3232
working-directory: shell_integration/MacOSX/NextcloudFileProviderKit
3333

3434
steps:
35-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
35+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3636

3737
- uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
3838
with:

0 commit comments

Comments
 (0)