Skip to content

Commit d0882d4

Browse files
authored
Merge branch 'master' into add-introvox-translations
2 parents 49b693d + f691274 commit d0882d4

5 files changed

Lines changed: 13 additions & 14 deletions

File tree

.github/workflows/build-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
24+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2525
with:
2626
persist-credentials: false
2727
fetch-depth: 0
@@ -49,20 +49,20 @@ jobs:
4949

5050
steps:
5151
- name: Checkout repository
52-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
52+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
5353
with:
5454
persist-credentials: false
5555

5656
- name: Set up QEMU
57-
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
57+
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
5858
with:
5959
# https://github.com/tonistiigi/binfmt/issues/240
6060
# https://github.com/docker/buildx/issues/1170
6161
image: tonistiigi/binfmt:qemu-v7.0.0-28
6262
cache-image: false
6363

6464
- name: Set up Docker Buildx
65-
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
65+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
6666

6767
- name: Build Docker image ${{ matrix.dockerfile }}
6868
run: |

.github/workflows/docker.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,38 @@ jobs:
3636
require: admin
3737

3838
- name: Check out the repo
39-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
39+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4040
with:
4141
persist-credentials: false
4242

4343
- name: Log in to GitHub Docker Registry
44-
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
44+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
4545
with:
4646
registry: docker.pkg.github.com
4747
username: ${{ github.actor }}
4848
password: ${{ secrets.GITHUB_TOKEN }}
4949

5050
- name: Set up QEMU
51-
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
51+
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
5252
with:
5353
# https://github.com/tonistiigi/binfmt/issues/240
5454
# https://github.com/docker/buildx/issues/1170
5555
image: tonistiigi/binfmt:qemu-v7.0.0-28
5656
cache-image: false
5757

5858
- name: Set up Docker Buildx
59-
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
59+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
6060

6161
- name: Log in to GitHub Container Registry
62-
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
62+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
6363
with:
6464
registry: ghcr.io
6565
username: ${{ github.actor }}
6666
password: ${{ secrets.GITHUB_TOKEN }}
6767

6868
- name: Build container image
6969
if: ${{ !startsWith(github.event.inputs.folderPath, 'android') }}
70-
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
70+
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
7171
with:
7272
platforms: ${{ (startsWith(github.event.inputs.folderPath, 'client') || startsWith(github.event.inputs.folderPath, 'translations')) && 'linux/amd64' || (endsWith(github.event.inputs.folderPath, '32bit') && 'linux/386' || 'linux/amd64,linux/arm64') }}
7373
push: true
@@ -79,7 +79,7 @@ jobs:
7979
# Android needs without platform to be able to build with buildx
8080
- name: Build container image (Android)
8181
if: ${{ startsWith(github.event.inputs.folderPath, 'android') }}
82-
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
82+
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
8383
with:
8484
push: true
8585
context: ${{ github.event.inputs.folderPath }}

.github/workflows/lint-php-cs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2929
with:
3030
persist-credentials: false
3131

.github/workflows/test-translationtool.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
26+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2727
with:
2828
persist-credentials: false
2929

translations/config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@
234234
"nextcloud passman-android",
235235
"nextcloud passman-webextension",
236236
"nextcloud talk-android",
237-
"nerzhul ownCloud-SMS-App",
238237
"stefan-niedermann nextcloud-deck",
239238
"stefan-niedermann nextcloud-tables"
240239
]

0 commit comments

Comments
 (0)