Skip to content

Commit

Permalink
Merge branch 'main' into feat/15712-add-keyboard-shortcut-selection-o…
Browse files Browse the repository at this point in the history
…n-grid

* main: (32 commits)
  docs: clean up environment variables formatting & grammar (immich-app#16555)
  fix: reset/regenerate memories (immich-app#16548)
  fix(deps): update machine-learning (immich-app#16560)
  chore(deps): update node (immich-app#16538)
  refactor: migration tag repository to kysely (immich-app#16398)
  feat: qr code for new shared link (immich-app#16543)
  chore(deps): update github-actions (immich-app#16539)
  fix(docs): info on preloading ML models (immich-app#16452)
  docs: better facial recognition cluster guide (immich-app#14911)
  fix(web): delete action closes asset viewer in asset view (immich-app#15469)
  feat(cli): watch paths for auto uploading daemon (immich-app#14923)
  ci: weblate checks should always run, should skip on en.json (immich-app#16544)
  feat(web): Video memories on web (immich-app#16500)
  fix(deps): update typescript-projects (immich-app#16540)
  chore(mobile): fix store.put type def (immich-app#16517)
  refactor(mobile): move timeline methods to timeline repo (immich-app#16526)
  chore(deps): update dependency eslint-plugin-svelte to v3 (immich-app#16532)
  refactor(server): link live photos as part of metadata extraction instead of queueing job (immich-app#16390)
  chore(deps): update dependency globals to v16 (immich-app#16534)
  ci: don't check weblate lock on chore/translations and add success job (immich-app#16533)
  ...
  • Loading branch information
knechtandreas committed Mar 4, 2025
2 parents a0302ca + 6398489 commit de12932
Show file tree
Hide file tree
Showing 162 changed files with 4,681 additions and 2,850 deletions.
2 changes: 1 addition & 1 deletion .github/DISCUSSION_TEMPLATE/feature-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ body:
- type: checkboxes
attributes:
label: I have searched the existing feature requests to make sure this is not a duplicate request.
label: I have searched the existing feature requests, both open and closed, to make sure this is not a duplicate request.
options:
- label: "Yes"
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Report an issue with Immich
body:
- type: checkboxes
attributes:
label: I have searched the existing issues to make sure this is not a duplicate report.
label: I have searched the existing issues, both open and closed, to make sure this is not a duplicate report.
options:
- label: "Yes"
required: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ jobs:
uses: actions/checkout@v4

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

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

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
type=raw,value=latest,enable=${{ github.event_name == 'release' }}
- name: Build and push image
uses: docker/build-push-action@v6.13.0
uses: docker/build-push-action@v6.15.0
with:
file: cli/Dockerfile
platforms: linux/amd64,linux/arm64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
uses: actions/checkout@v4

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

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
- name: Build and push image
id: build
uses: docker/build-push-action@v6.13.0
uses: docker/build-push-action@v6.15.0
with:
context: ${{ env.context }}
file: ${{ env.file }}
Expand Down Expand Up @@ -334,7 +334,7 @@ jobs:
- name: Build and push image
id: build
uses: docker/build-push-action@v6.13.0
uses: docker/build-push-action@v6.15.0
with:
context: ${{ env.context }}
file: ${{ env.file }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ jobs:
runs-on: ubuntu-latest
services:
postgres:
image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:739cdd626151ff1f796dc95a6591b55a714f341c737e27f045019ceabf8e8c52
env:
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/weblate-lock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Weblate checks

on:
pull_request:
branches: [main]

jobs:
pre-job:
runs-on: ubuntu-latest
outputs:
should_run: ${{ steps.found_paths.outputs.i18n == 'true' && github.head_ref != 'chore/translations'}}
steps:
- name: Checkout code
uses: actions/checkout@v4
- id: found_paths
uses: dorny/paths-filter@v3
with:
filters: |
i18n:
- 'i18n/!(en)**\.json'
enforce-lock:
name: Check Weblate Lock
runs-on: ubuntu-latest
if: ${{ needs.pre-job.outputs.should_run == 'true' }}
steps:
- name: Check weblate lock
run: |
if [[ "false" = $(curl https://hosted.weblate.org/api/components/immich/immich/lock/ | jq .locked) ]]; then
exit 1
fi
- name: Find Pull Request
uses: juliangruber/find-pull-request-action@v1
id: find-pr
with:
branch: chore/translations
- name: Fail if existing weblate PR
if: ${{ steps.find-pr.outputs.number }}
run: exit 1
success-check-lock:
name: Weblate Lock Check Success
needs: [ enforce-lock ]
runs-on: ubuntu-latest
if: always()
steps:
- name: Any jobs failed?
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
- name: All jobs passed or skipped
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: echo "All jobs passed or skipped" && echo "${{ toJSON(needs.*.result) }}"
2 changes: 1 addition & 1 deletion cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.13.1-alpine3.20@sha256:c52e20859a92b3eccbd3a36c5e1a90adc20617d8d421d65e8a622e87b5dac963 AS core
FROM node:22.14.0-alpine3.20@sha256:40be979442621049f40b1d51a26b55e281246b5de4e5f51a18da7beb6e17e3f9 AS core

WORKDIR /usr/src/open-api/typescript-sdk
COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./
Expand Down
Loading

0 comments on commit de12932

Please sign in to comment.