Skip to content

Commit

Permalink
Merge branch 'main' into feat/partnershare_persons
Browse files Browse the repository at this point in the history
  • Loading branch information
ttyridal authored Feb 14, 2024
2 parents 3fd1c54 + 87ae0be commit 69f58d8
Show file tree
Hide file tree
Showing 341 changed files with 11,416 additions and 6,941 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ cli/.reverse-geocoding-dump/
cli/upload/
cli/dist/

e2e/

open-api/typescript-sdk/node_modules/
open-api/typescript-sdk/build/
8 changes: 4 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ mobile/openapi/.openapi-generator/FILES linguist-generated=true
mobile/lib/**/*.g.dart -diff -merge
mobile/lib/**/*.g.dart linguist-generated=true

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

*.sh text eol=lf
22 changes: 15 additions & 7 deletions .github/workflows/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ on:
workflow_dispatch:
push:
branches: [main]
paths:
- 'cli/**'
- '.github/workflows/cli.yml'
paths:
- "cli/**"
- ".github/workflows/cli.yml"
pull_request:
branches: [main]
paths:
- 'cli/**'
- '.github/workflows/cli.yml'
paths:
- "cli/**"
- ".github/workflows/cli.yml"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -34,7 +34,12 @@ jobs:
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:
Expand Down Expand Up @@ -62,7 +67,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Get package version
id: package-version
run: |
Expand All @@ -73,10 +78,13 @@ jobs:
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]
Expand Down
32 changes: 30 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,34 @@ jobs:
run: npm run test:cov
if: ${{ !cancelled() }}

web-e2e-tests:
name: Web (e2e)
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./e2e

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

- name: Run setup typescript-sdk
run: npm ci && npm run build
working-directory: ./open-api/typescript-sdk

- name: Install dependencies
run: npm ci

- name: Install Playwright Browsers
run: npx playwright install --with-deps

- name: Docker build
run: docker compose -f docker/docker-compose.e2e.yml build
working-directory: ./

- name: Run e2e tests
run: npx playwright test

mobile-unit-tests:
name: Mobile
runs-on: ubuntu-latest
Expand Down Expand Up @@ -247,7 +275,7 @@ jobs:
poetry run mypy --install-types --non-interactive --strict app/
- name: Run tests and coverage
run: |
poetry run pytest --cov app
poetry run pytest app --cov=app --cov-report term-missing
generated-api-up-to-date:
name: OpenAPI Clients
Expand Down Expand Up @@ -275,7 +303,7 @@ jobs:
runs-on: ubuntu-latest
services:
postgres:
image: tensorchord/pgvecto-rs:pg14-v0.2.0
image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
env:
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
Expand Down
Loading

0 comments on commit 69f58d8

Please sign in to comment.