Skip to content

Commit 954200e

Browse files
etnoyetnoy
committed
Merge branch 'main' of https://github.com/immich-app/immich into feat/inline-offline-check
2 parents 5968d63 + 0dcfc43 commit 954200e

File tree

193 files changed

+5113
-3028
lines changed

Some content is hidden

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

193 files changed

+5113
-3028
lines changed

Diff for: ‎.github/DISCUSSION_TEMPLATE/feature-request.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ body:
1111
1212
- type: checkboxes
1313
attributes:
14-
label: I have searched the existing feature requests to make sure this is not a duplicate request.
14+
label: I have searched the existing feature requests, both open and closed, to make sure this is not a duplicate request.
1515
options:
1616
- label: "Yes"
1717
required: true

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: Report an issue with Immich
22
description: Report an issue with Immich
33
body:
4+
- type: checkboxes
5+
attributes:
6+
label: I have searched the existing issues, both open and closed, to make sure this is not a duplicate report.
7+
options:
8+
- label: "Yes"
9+
required: true
10+
411
- type: markdown
512
attributes:
613
value: |

Diff for: ‎.github/workflows/cli.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ jobs:
5656
uses: actions/checkout@v4
5757

5858
- name: Set up QEMU
59-
uses: docker/setup-qemu-action@v3.4.0
59+
uses: docker/setup-qemu-action@v3.5.0
6060

6161
- name: Set up Docker Buildx
62-
uses: docker/setup-buildx-action@v3.9.0
62+
uses: docker/setup-buildx-action@v3.10.0
6363

6464
- name: Login to GitHub Container Registry
6565
uses: docker/login-action@v3
@@ -88,7 +88,7 @@ jobs:
8888
type=raw,value=latest,enable=${{ github.event_name == 'release' }}
8989
9090
- name: Build and push image
91-
uses: docker/build-push-action@v6.13.0
91+
uses: docker/build-push-action@v6.15.0
9292
with:
9393
file: cli/Dockerfile
9494
platforms: linux/amd64,linux/arm64

Diff for: ‎.github/workflows/docker.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
uses: actions/checkout@v4
142142

143143
- name: Set up Docker Buildx
144-
uses: docker/setup-buildx-action@v3.9.0
144+
uses: docker/setup-buildx-action@v3.10.0
145145

146146
- name: Login to GitHub Container Registry
147147
uses: docker/login-action@v3
@@ -171,7 +171,7 @@ jobs:
171171
172172
- name: Build and push image
173173
id: build
174-
uses: docker/build-push-action@v6.13.0
174+
uses: docker/build-push-action@v6.15.0
175175
with:
176176
context: ${{ env.context }}
177177
file: ${{ env.file }}
@@ -334,7 +334,7 @@ jobs:
334334
335335
- name: Build and push image
336336
id: build
337-
uses: docker/build-push-action@v6.13.0
337+
uses: docker/build-push-action@v6.15.0
338338
with:
339339
context: ${{ env.context }}
340340
file: ${{ env.file }}

Diff for: ‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ jobs:
457457
runs-on: ubuntu-latest
458458
services:
459459
postgres:
460-
image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
460+
image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:739cdd626151ff1f796dc95a6591b55a714f341c737e27f045019ceabf8e8c52
461461
env:
462462
POSTGRES_PASSWORD: postgres
463463
POSTGRES_USER: postgres

Diff for: ‎.github/workflows/weblate-lock.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Weblate checks
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
7+
jobs:
8+
pre-job:
9+
runs-on: ubuntu-latest
10+
outputs:
11+
should_run: ${{ steps.found_paths.outputs.i18n == 'true' && github.head_ref != 'chore/translations'}}
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v4
15+
- id: found_paths
16+
uses: dorny/paths-filter@v3
17+
with:
18+
filters: |
19+
i18n:
20+
- 'i18n/!(en)**\.json'
21+
enforce-lock:
22+
name: Check Weblate Lock
23+
runs-on: ubuntu-latest
24+
if: ${{ needs.pre-job.outputs.should_run == 'true' }}
25+
steps:
26+
- name: Check weblate lock
27+
run: |
28+
if [[ "false" = $(curl https://hosted.weblate.org/api/components/immich/immich/lock/ | jq .locked) ]]; then
29+
exit 1
30+
fi
31+
- name: Find Pull Request
32+
uses: juliangruber/find-pull-request-action@v1
33+
id: find-pr
34+
with:
35+
branch: chore/translations
36+
- name: Fail if existing weblate PR
37+
if: ${{ steps.find-pr.outputs.number }}
38+
run: exit 1
39+
success-check-lock:
40+
name: Weblate Lock Check Success
41+
needs: [ enforce-lock ]
42+
runs-on: ubuntu-latest
43+
if: always()
44+
steps:
45+
- name: Any jobs failed?
46+
if: ${{ contains(needs.*.result, 'failure') }}
47+
run: exit 1
48+
- name: All jobs passed or skipped
49+
if: ${{ !(contains(needs.*.result, 'failure')) }}
50+
run: echo "All jobs passed or skipped" && echo "${{ toJSON(needs.*.result) }}"

Diff for: ‎cli/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:22.13.1-alpine3.20@sha256:c52e20859a92b3eccbd3a36c5e1a90adc20617d8d421d65e8a622e87b5dac963 AS core
1+
FROM node:22.14.0-alpine3.20@sha256:40be979442621049f40b1d51a26b55e281246b5de4e5f51a18da7beb6e17e3f9 AS core
22

33
WORKDIR /usr/src/open-api/typescript-sdk
44
COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./

0 commit comments

Comments
 (0)