Skip to content

Commit

Permalink
Merge branch 'immich-app:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
magicedy authored May 23, 2024
2 parents 46ba48c + 8bfa676 commit 9042e1b
Show file tree
Hide file tree
Showing 3,093 changed files with 242,223 additions and 201,896 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
30 changes: 30 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.vscode/
.github/
.git/

design/
docker/
docs/
e2e/
fastlane/
machine-learning/
misc/
mobile/

cli/coverage/
cli/dist/
cli/node_modules/

open-api/typescript-sdk/build/
open-api/typescript-sdk/node_modules/

server/coverage/
server/node_modules/
server/upload/
server/dist/
server/www/

web/node_modules/
web/coverage/
web/.svelte-kit
web/build/
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ max_line_length = off
trim_trailing_whitespace = false

[*.{yml,yaml}]
quote_type = double
quote_type = single
15 changes: 5 additions & 10 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ mobile/openapi/**/*.md -diff -merge
mobile/openapi/**/*.md linguist-generated=true
mobile/openapi/**/*.dart -diff -merge
mobile/openapi/**/*.dart linguist-generated=true
mobile/openapi/.openapi-generator/FILES -diff -merge
mobile/openapi/.openapi-generator/FILES linguist-generated=true

mobile/lib/**/*.g.dart -diff -merge
mobile/lib/**/*.g.dart linguist-generated=true

cli/src/api/open-api/**/*.md -diff -merge
cli/src/api/open-api/**/*.md linguist-generated=true
cli/src/api/open-api/**/*.ts -diff -merge
cli/src/api/open-api/**/*.ts linguist-generated=true
open-api/typescript-sdk/fetch-client.ts -diff -merge
open-api/typescript-sdk/fetch-client.ts linguist-generated=true

web/src/api/open-api/**/*.md -diff -merge
web/src/api/open-api/**/*.md linguist-generated=true
web/src/api/open-api/**/*.ts -diff -merge
web/src/api/open-api/**/*.ts linguist-generated=true
*.sh text eol=lf
8 changes: 8 additions & 0 deletions .github/DISCUSSION_TEMPLATE/feature-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ body:
attributes:
value: |
Please use this form to request new feature for Immich
- type: checkboxes
attributes:
label: I have searched the existing feature requests to make sure this is not a duplicate request.
options:
- label: "Yes"
required: true

- type: textarea
id: feature
attributes:
Expand Down
5 changes: 0 additions & 5 deletions .github/FUNDING.yml

This file was deleted.

12 changes: 10 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
name: Report an issue with Immich
description: Report an issue with Immich
labels: ["bug", "need triage"]
title: "[BUG] <title>"
body:
- type: markdown
attributes:
Expand Down Expand Up @@ -89,6 +87,16 @@ body:
validations:
required: true

- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant logs below. (code formatting is
enabled, no need for backticks)
render: shell
validations:
required: false

- type: textarea
attributes:
label: Additional information
Expand Down
41 changes: 41 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
changelog:
categories:
- title: ⚠️ Breaking Changes
labels:
- breaking-change

- title: 🗄️ Server
labels:
- 🗄️server

- title: 📱 Mobile
labels:
- 📱mobile

- title: 🖥️ Web
labels:
- 🖥️web

- title: 🧠 Machine Learning
labels:
- 🧠machine-learning

- title: ⚡ CLI
labels:
- cli

- title: 📓 Documentation
labels:
- documentation

- title: 🔨 Maintenance
labels:
- deployment
- dependencies
- renovate
- maintenance
- tech-debt

- title: Other changes
labels:
- "*"
16 changes: 8 additions & 8 deletions .github/workflows/build-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
name: Build and sign Android
# Skip when PR from a fork
if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
runs-on: macos-12
runs-on: macos-14

steps:
- name: Determine ref
Expand All @@ -35,17 +35,17 @@ jobs:
with:
ref: ${{ steps.get-ref.outputs.ref }}

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "zulu"
java-version: "12.x"
cache: "gradle"
distribution: 'zulu'
java-version: '17'
cache: 'gradle'

- name: Setup Flutter SDK
uses: subosito/flutter-action@v2
with:
channel: "stable"
flutter-version: "3.13.3"
channel: 'stable'
flutter-version: '3.22.0'
cache: true

- name: Create the Keystore
Expand All @@ -69,7 +69,7 @@ jobs:
flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
- name: Publish Android Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: release-apk-signed
path: mobile/build/app/outputs/flutter-apk/*.apk
3 changes: 2 additions & 1 deletion .github/workflows/cache-cleanup.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Clean up actions cache on PR close
name: Cache Cleanup
on:
pull_request:
types:
Expand All @@ -10,6 +10,7 @@ concurrency:

jobs:
cleanup:
name: Cleanup
runs-on: ubuntu-latest
steps:
- name: Check out code
Expand Down
98 changes: 98 additions & 0 deletions .github/workflows/cli.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
name: CLI Build
on:
workflow_dispatch:
push:
branches: [main]
paths:
- "cli/**"
- ".github/workflows/cli.yml"
pull_request:
branches: [main]
paths:
- "cli/**"
- ".github/workflows/cli.yml"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions:
packages: write

jobs:
publish:
name: Publish
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./cli

steps:
- uses: actions/checkout@v4
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v4
with:
node-version: "20.x"
registry-url: "https://registry.npmjs.org"
- name: Prepare SDK
run: npm ci --prefix ../open-api/typescript-sdk/
- name: Build SDK
run: npm run build --prefix ../open-api/typescript-sdk/
- run: npm ci
- run: npm run build
- run: npm publish
if: ${{ github.event_name == 'workflow_dispatch' }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

docker:
name: Docker
runs-on: ubuntu-latest
needs: publish

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/[email protected]

- name: Set up Docker Buildx
uses: docker/[email protected]

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
if: ${{ !github.event.pull_request.head.repo.fork }}
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Get package version
id: package-version
run: |
version=$(jq -r '.version' cli/package.json)
echo "version=$version" >> "$GITHUB_OUTPUT"
- name: Generate docker image tags
id: metadata
uses: docker/metadata-action@v5
with:
flavor: |
latest=false
images: |
name=ghcr.io/${{ github.repository_owner }}/immich-cli
tags: |
type=raw,value=${{ steps.package-version.outputs.version }},enable=${{ github.event_name == 'workflow_dispatch' }}
type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
- name: Build and push image
uses: docker/[email protected]
with:
file: cli/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name == 'workflow_dispatch' }}
cache-from: type=gha
cache-to: type=gha,mode=max
tags: ${{ steps.metadata.outputs.tags }}
labels: ${{ steps.metadata.outputs.labels }}
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -60,7 +60,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
26 changes: 0 additions & 26 deletions .github/workflows/dispatch_sdk_update.yml

This file was deleted.

Loading

0 comments on commit 9042e1b

Please sign in to comment.