Skip to content

Commit

Permalink
Merge pull request #91 from nsg/bump/v1.74.0
Browse files Browse the repository at this point in the history
Bump v1.74.0
  • Loading branch information
nsg authored Aug 19, 2023
2 parents f84ec3b + 0f003ca commit 29f4330
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 129 deletions.
53 changes: 0 additions & 53 deletions .github/workflows/system-tests-edge.yaml

This file was deleted.

54 changes: 44 additions & 10 deletions .github/workflows/system-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,46 @@ on:
workflow_dispatch:

jobs:
build-and-test-snap:
prepare:
runs-on: ubuntu-latest

outputs:
runjob: ${{ steps.detect.outputs.runjob }}

steps:
- uses: actions/checkout@v3

- name: Detect if this commit already have an active workflow running
id: detect
env:
GH_TOKEN: ${{ github.token }}
run: |
sleep $(( RANDOM % 10 ))
if gh run list --status in_progress --json headSha --jq ".[].headSha" | grep -q "$GITHUB_SHA"; then
echo "This commit already have an active workflow running, canceling this one."
echo "runjob=yes" >> $GITHUB_OUTPUT
fi
build:
name: Build Snap Package
runs-on: ubuntu-latest
needs: [ prepare ]
if: ${{ needs.prepare.outputs.runjob == 'yes' }}

steps:
- uses: actions/checkout@v3
- uses: snapcore/action-build@v1
- uses: actions/cache/save@v3
with:
path: "*.snap"
key: ${{ github.workflow }}-${{ github.sha }}

test:
name: Install and Test Snap Package
runs-on: ubuntu-latest
needs: [ prepare, build ]
if: ${{ needs.prepare.outputs.runjob == 'yes' }}

services:
selenium:
image: selenium/standalone-chrome:latest
Expand All @@ -31,16 +68,13 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: snapcore/action-build@v1

- uses: actions/cache/restore@v3
with:
path: "*.snap"
key: ${{ github.workflow }}-${{ github.sha }}

- name: Install package
run: |
sudo snap install --dangerous *.snap
# - name: Install package
# run: |
# sudo snap install --edge immich-distribution

run: sudo snap install --dangerous *.snap

- name: Install requirements
run: pip install -r tests/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.73.0
v1.74.0
2 changes: 1 addition & 1 deletion parts/machine-learning/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: build
build:
./build.sh v1.73.0
./build.sh v1.74.0

.PHONY: install
install:
Expand Down
4 changes: 2 additions & 2 deletions patches/001-version-announcement-box.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- web/src/lib/components/shared-components/version-announcement-box.svelte 2023-07-20 20:45:53.673236581 +0200
+++ web/src/lib/components/shared-components/version-announcement-box-snap.svelte 2023-07-20 21:19:55.952997300 +0200
--- web/src/lib/components/shared-components/version-announcement-box.svelte 2023-08-19 10:50:26.428774805 +0200
+++ web/src/lib/components/shared-components/version-announcement-box-snap.svelte 2023-08-19 10:51:08.320877048 +0200
@@ -48,20 +48,28 @@
<p class="mb-4 text-2xl">🎉 NEW VERSION AVAILABLE 🎉</p>

Expand Down
2 changes: 1 addition & 1 deletion patches/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=v1.73.0
VERSION=v1.74.0
SOURCE_FILE_PATH=https://raw.githubusercontent.com/immich-app/immich/${VERSION}/web/src/lib/components/shared-components/version-announcement-box.svelte

download-patch:
Expand Down
6 changes: 3 additions & 3 deletions patches/src/version-announcement-box-snap.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
import { getGithubVersion } from '$lib/utils/get-github-version';
import { onMount } from 'svelte';
import FullScreenModal from './full-screen-modal.svelte';
import type { ServerVersionReponseDto } from '@api';
import type { ServerVersionResponseDto } from '@api';
import Button from '../elements/buttons/button.svelte';
export let serverVersion: ServerVersionReponseDto;
export let serverVersion: ServerVersionResponseDto;
let showModal = false;
let githubVersion: string;
$: serverVersionName = semverToName(serverVersion);
function semverToName({ major, minor, patch }: ServerVersionReponseDto) {
function semverToName({ major, minor, patch }: ServerVersionResponseDto) {
return `v${major}.${minor}.${patch}`;
}
Expand Down
6 changes: 3 additions & 3 deletions patches/src/version-announcement-box.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
import { getGithubVersion } from '$lib/utils/get-github-version';
import { onMount } from 'svelte';
import FullScreenModal from './full-screen-modal.svelte';
import type { ServerVersionReponseDto } from '@api';
import type { ServerVersionResponseDto } from '@api';
import Button from '../elements/buttons/button.svelte';
export let serverVersion: ServerVersionReponseDto;
export let serverVersion: ServerVersionResponseDto;
let showModal = false;
let githubVersion: string;
$: serverVersionName = semverToName(serverVersion);
function semverToName({ major, minor, patch }: ServerVersionReponseDto) {
function semverToName({ major, minor, patch }: ServerVersionResponseDto) {
return `v${major}.${minor}.${patch}`;
}
Expand Down
56 changes: 2 additions & 54 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ parts:
plugin: npm
npm-node-version: "18.16.0"
source: https://github.com/immich-app/immich.git
source-tag: v1.73.0
source-tag: v1.74.0
source-subdir: server
override-build: |
snapcraftctl set-version "$(git describe --tags)-dist1"
Expand All @@ -196,66 +196,14 @@ parts:
cp -r bin $SNAPCRAFT_PART_INSTALL/usr/src/app
cp package.json $SNAPCRAFT_PART_INSTALL/usr/src/app
cp start-server.sh start-microservices.sh $SNAPCRAFT_PART_INSTALL/usr/src/app
stage-packages:
- libc-ares2
- libicu66
- libnghttp2-14
- libnode64
- libuv1
- libaec0
- libcairo-gobject2
- libcairo2
- libcfitsio8
- libcurl3-gnutls
- libdatrie1
- libexif12
- libfftw3-double3
- libfribidi0
- libgdk-pixbuf2.0-0
- libgif7
- libgraphite2-3
- libgsf-1-114
- libharfbuzz0b
- libhdf5-103
- libilmbase24
- libimagequant0
- libjbig0
- libjpeg-turbo8
- liblcms2-2
- liblqr-1-0
- libltdl7
- libmagickcore-6.q16-6
- libmatio9
- libnspr4
- libnss3
- libopenexr24
- libopenjp2-7
- libopenslide0
- liborc-0.4-0
- libpango-1.0-0
- libpangocairo-1.0-0
- libpangoft2-1.0-0
- libpixman-1-0
- libpoppler-glib8
- libpoppler97
- librsvg2-2
- libsz2
- libthai0
- libtiff5
- libwebp6
- libwebpdemux2
- libwebpmux3
- libxcb-render0
- libxcb-shm0
- libxml2
after:
- dependencies

web:
plugin: npm
npm-node-version: "18.16.0"
source: https://github.com/immich-app/immich.git
source-tag: v1.73.0
source-tag: v1.74.0
source-subdir: web
override-build: |
patch -p0 -i $SNAPCRAFT_PART_SRC/../../patches/src/001-version-announcement-box.patch -d $SNAPCRAFT_PART_BUILD
Expand Down
3 changes: 2 additions & 1 deletion src/bin/typesense
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ if [ -z $TYPESENSE_API_KEY ]; then
exit 1
fi

$SNAP/bin/typesense-server 2>&1 | grep -Ev "raft_server.cpp:546|raft_server.h:60|Running GC for aborted requests"
export GLOG_minloglevel=1
$SNAP/bin/typesense-server

0 comments on commit 29f4330

Please sign in to comment.