Skip to content

Commit d288f0a

Browse files
authored
Merge branch 'main' into timestams-with-seconds
2 parents db630eb + 746252f commit d288f0a

File tree

1,218 files changed

+67299
-46597
lines changed

Some content is hidden

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

1,218 files changed

+67299
-46597
lines changed

.devcontainer/mobile/container-compose-overrides.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ services:
44
target: dev-container-mobile
55
environment:
66
- IMMICH_SERVER_URL=http://127.0.0.1:2283/
7-
- IMMICH_MEDIA_LOCATION=/data
87
volumes: !override # bind mount host to /workspaces/immich
98
- ..:/workspaces/immich
109
- cli_node_modules:/workspaces/immich/cli/node_modules

.devcontainer/server/container-compose-overrides.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ services:
66
hostname: immich-dev
77
environment:
88
- IMMICH_SERVER_URL=http://127.0.0.1:2283/
9-
- IMMICH_MEDIA_LOCATION=/data
109
volumes: !override
1110
- ..:/workspaces/immich
1211
- cli_node_modules:/workspaces/immich/cli/node_modules

.github/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.17.1
1+
22.18.0
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
on:
2+
issues:
3+
types: [opened]
4+
discussion:
5+
types: [created]
6+
7+
name: Close likely duplicates
8+
permissions: {}
9+
10+
jobs:
11+
get_body:
12+
runs-on: ubuntu-latest
13+
env:
14+
EVENT: ${{ toJSON(github.event) }}
15+
outputs:
16+
body: ${{ steps.get_body.outputs.body }}
17+
steps:
18+
- id: get_body
19+
run: |
20+
BODY=$(echo """$EVENT""" | jq -r '.issue // .discussion | .body' | base64 -w 0)
21+
echo "body=$BODY" >> $GITHUB_OUTPUT
22+
23+
get_checkbox_json:
24+
runs-on: ubuntu-latest
25+
needs: get_body
26+
container:
27+
image: yshavit/mdq:0.7.2
28+
outputs:
29+
json: ${{ steps.get_checkbox.outputs.json }}
30+
steps:
31+
- id: get_checkbox
32+
env:
33+
BODY: ${{ needs.get_body.outputs.body }}
34+
run: |
35+
JSON=$(echo "$BODY" | base64 -d | /mdq --output json '# I have searched | - [?] Yes')
36+
echo "json=$JSON" >> $GITHUB_OUTPUT
37+
38+
close_and_comment:
39+
runs-on: ubuntu-latest
40+
needs: get_checkbox_json
41+
if: ${{ !fromJSON(needs.get_checkbox_json.outputs.json).items[0].list[0].checked }}
42+
permissions:
43+
issues: write
44+
discussions: write
45+
steps:
46+
- name: Close issue
47+
if: ${{ github.event_name == 'issues' }}
48+
env:
49+
GH_TOKEN: ${{ github.token }}
50+
NODE_ID: ${{ github.event.issue.node_id }}
51+
run: |
52+
gh api graphql \
53+
-f issueId="$NODE_ID" \
54+
-f body="This issue has automatically been closed as it is likely a duplicate. We get a lot of duplicate threads each day, which is why we ask you in the template to confirm that you searched for duplicates before opening one." \
55+
-f query='
56+
mutation CommentAndCloseIssue($issueId: ID!, $body: String!) {
57+
addComment(input: {
58+
subjectId: $issueId,
59+
body: $body
60+
}) {
61+
__typename
62+
}
63+
64+
closeIssue(input: {
65+
issueId: $issueId,
66+
stateReason: DUPLICATE
67+
}) {
68+
__typename
69+
}
70+
}'
71+
72+
- name: Close discussion
73+
if: ${{ github.event_name == 'discussion' && github.event.discussion.category.name == 'Feature Request' }}
74+
env:
75+
GH_TOKEN: ${{ github.token }}
76+
NODE_ID: ${{ github.event.discussion.node_id }}
77+
run: |
78+
gh api graphql \
79+
-f discussionId="$NODE_ID" \
80+
-f body="This discussion has automatically been closed as it is likely a duplicate. We get a lot of duplicate threads each day, which is why we ask you in the template to confirm that you searched for duplicates before opening one." \
81+
-f query='
82+
mutation CommentAndCloseDiscussion($discussionId: ID!, $body: String!) {
83+
addDiscussionComment(input: {
84+
discussionId: $discussionId,
85+
body: $body
86+
}) {
87+
__typename
88+
}
89+
90+
closeDiscussion(input: {
91+
discussionId: $discussionId,
92+
reason: DUPLICATE
93+
}) {
94+
__typename
95+
}
96+
}'

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
# Initializes the CodeQL tools for scanning.
5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
53+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
5454
with:
5555
languages: ${{ matrix.language }}
5656
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
6363
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6464
# If this step fails, then you should remove it and run the build manually (see below)
6565
- name: Autobuild
66-
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
66+
uses: github/codeql-action/autobuild@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
6767

6868
# ℹ️ Command-line programs to run using the OS shell.
6969
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
7676
# ./location_of_script_within_repo/buildscript.sh
7777

7878
- name: Perform CodeQL Analysis
79-
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
79+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
8080
with:
8181
category: '/language:${{matrix.language}}'

.github/workflows/docs-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
permissions:
1919
contents: read
2020
outputs:
21-
should_run: ${{ steps.found_paths.outputs.docs == 'true' || steps.should_force.outputs.should_force == 'true' }}
21+
should_run: ${{ steps.found_paths.outputs.docs == 'true' || steps.found_paths.outputs.open-api == 'true' || steps.should_force.outputs.should_force == 'true' }}
2222
steps:
2323
- name: Checkout code
2424
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -32,6 +32,8 @@ jobs:
3232
- 'docs/**'
3333
workflow:
3434
- '.github/workflows/docs-build.yml'
35+
open-api:
36+
- 'open-api/immich-openapi-specs.json'
3537
- name: Check if we should force jobs to run
3638
id: should_force
3739
run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'release' || github.ref_name == 'main' }}" >> "$GITHUB_OUTPUT"

.github/workflows/static_analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
130130

131131
- name: Upload SARIF file
132-
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
132+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
133133
with:
134134
sarif_file: results.sarif
135135
category: zizmor

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ jobs:
668668
contents: read
669669
services:
670670
postgres:
671-
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3@sha256:1f5583fe3397210a0fbc7f11b0cec18bacc4a99e3e8ea0548e9bd6bcf26ec37a
671+
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3@sha256:ec713143dca1a426eba2e03707c319e2ec3cc9d304ef767f777f8e297dee820c
672672
env:
673673
POSTGRES_PASSWORD: postgres
674674
POSTGRES_USER: postgres

.github/workflows/weblate-lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
exit 1
3939
fi
4040
- name: Find Pull Request
41-
uses: juliangruber/find-pull-request-action@48b6133aa6c826f267ebd33aa2d29470f9d9e7d0 # v1.9.0
41+
uses: juliangruber/find-pull-request-action@952b3bb1ddb2dcc0aa3479e98bb1c2d1a922f096 # v1.10.0
4242
id: find-pr
4343
with:
4444
branch: chore/translations

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"restart": true,
88
"port": 9231,
99
"name": "Immich API Server",
10-
"remoteRoot": "/usr/src/app",
10+
"remoteRoot": "/usr/src/app/server",
1111
"localRoot": "${workspaceFolder}/server"
1212
},
1313
{
@@ -16,7 +16,7 @@
1616
"restart": true,
1717
"port": 9230,
1818
"name": "Immich Workers",
19-
"remoteRoot": "/usr/src/app",
19+
"remoteRoot": "/usr/src/app/server",
2020
"localRoot": "${workspaceFolder}/server"
2121
}
2222
]

0 commit comments

Comments
 (0)