Skip to content

Commit

Permalink
Merge branch 'main' into fix/user-removal-from-option-menu-on-the-top…
Browse files Browse the repository at this point in the history
…-in-shared-album
  • Loading branch information
Pranav-8bit authored Oct 10, 2024
2 parents e739052 + 465f463 commit 0a83d6b
Show file tree
Hide file tree
Showing 136 changed files with 3,625 additions and 1,869 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
uses: docker/[email protected]

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

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
uses: docker/[email protected]

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

- name: Login to Docker Hub
# Only push to Docker Hub when making a release
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
uses: docker/[email protected]

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

- name: Login to Docker Hub
# Only push to Docker Hub when making a release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-label-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: read
pull-requests: write
steps:
- name: Require PR to have a changelog label
uses: mheap/github-action-required-labels@v5
Expand Down
22 changes: 21 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
run: npm run check
if: ${{ !cancelled() }}

- name: Run unit tests & coverage
- name: Run small tests & coverage
run: npm run test:cov
if: ${{ !cancelled() }}

Expand Down Expand Up @@ -243,6 +243,26 @@ jobs:
run: npm run check
if: ${{ !cancelled() }}

medium-tests-server:
name: Medium Tests (Server)
needs: pre-job
if: ${{ needs.pre-job.outputs.should_run_server == 'true' }}
runs-on: mich

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Production build
if: ${{ !cancelled() }}
run: docker compose -f e2e/docker-compose.yml build

- name: Run medium tests
if: ${{ !cancelled() }}
run: make test-medium

e2e-tests-server-cli:
name: End-to-End Tests (Server & CLI)
needs: pre-job
Expand Down
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ test-e2e:
docker compose -f ./e2e/docker-compose.yml build
npm --prefix e2e run test
npm --prefix e2e run test:web
test-medium:
docker run \
--rm \
-v ./server/src:/usr/src/app/src \
-v ./server/test:/usr/src/app/test \
-v ./server/vitest.config.medium.mjs:/usr/src/app/vitest.config.medium.mjs \
-v ./server/tsconfig.json:/usr/src/app/tsconfig.json \
-e NODE_ENV=development \
immich-server:latest \
-c "npm ci && npm run test:medium -- --run"
test-medium-dev:
docker exec -it immich_server /bin/sh -c "npm run test:medium"

build-all: $(foreach M,$(MODULES),build-$M) ;
install-all: $(foreach M,$(MODULES),install-$M) ;
Expand Down
2 changes: 1 addition & 1 deletion cli/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.17.0
20.18.0
Loading

0 comments on commit 0a83d6b

Please sign in to comment.