diff --git a/.github/workflows/weblate-lock.yml b/.github/workflows/weblate-lock.yml index e37497b9bb..cb11a11be4 100644 --- a/.github/workflows/weblate-lock.yml +++ b/.github/workflows/weblate-lock.yml @@ -36,7 +36,7 @@ jobs: github-token: ${{ steps.token.outputs.token }} filters: | i18n: - - modified: 'i18n/!(en)**\.json' + - modified: 'i18n/!(en|package)**\.json' skip-force-logic: 'true' enforce-lock: diff --git a/cli/package.json b/cli/package.json index cd102ea5f6..e1b97d6a09 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "@immich/cli", - "version": "2.2.106", + "version": "2.5.0", "description": "Command Line Interface (CLI) for Immich", "type": "module", "exports": "./dist/index.js", diff --git a/i18n/package.json b/i18n/package.json index 19d78c49b7..d2486d7b39 100644 --- a/i18n/package.json +++ b/i18n/package.json @@ -1,6 +1,6 @@ { "name": "immich-i18n", - "version": "1.0.0", + "version": "2.5.0", "private": true, "scripts": { "format": "prettier --check .", diff --git a/misc/release/pump-version.sh b/misc/release/pump-version.sh index deca397081..8bddf8430e 100755 --- a/misc/release/pump-version.sh +++ b/misc/release/pump-version.sh @@ -61,26 +61,23 @@ fi if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then echo "Pumping Server: $CURRENT_SERVER => $NEXT_SERVER" - jq --arg version "$NEXT_SERVER" '.version = $version' server/package.json > server/package.json.tmp && mv server/package.json.tmp server/package.json + + pnpm version "$NEXT_SERVER" --no-git-tag-version + pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix server + pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix i18n + pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix cli + pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix web + pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix e2e + pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix open-api/typescript-sdk + + # copy version to open-api spec pnpm install --frozen-lockfile --prefix server pnpm --prefix server run build - ( cd ./open-api && bash ./bin/generate-open-api.sh ) - jq --arg version "$NEXT_SERVER" '.version = $version' open-api/typescript-sdk/package.json > open-api/typescript-sdk/package.json.tmp && mv open-api/typescript-sdk/package.json.tmp open-api/typescript-sdk/package.json - - # TODO use $SERVER_PUMP once we pass 2.2.x - CURRENT_CLI_VERSION=$(jq -r '.version' cli/package.json) - CLI_PATCH_VERSION=$(echo "$CURRENT_CLI_VERSION" | awk -F. '{print $1"."$2"."($3+1)}') - jq --arg version "$CLI_PATCH_VERSION" '.version = $version' cli/package.json > cli/package.json.tmp && mv cli/package.json.tmp cli/package.json - pnpm install --frozen-lockfile --prefix cli - - jq --arg version "$NEXT_SERVER" '.version = $version' web/package.json > web/package.json.tmp && mv web/package.json.tmp web/package.json - pnpm install --frozen-lockfile --prefix web - - jq --arg version "$NEXT_SERVER" '.version = $version' e2e/package.json > e2e/package.json.tmp && mv e2e/package.json.tmp e2e/package.json - pnpm install --frozen-lockfile --prefix e2e uvx --from=toml-cli toml set --toml-path=machine-learning/pyproject.toml project.version "$NEXT_SERVER" + + ./misc/release/archive-version.js "$NEXT_SERVER" fi if [ "$CURRENT_MOBILE" != "$NEXT_MOBILE" ]; then @@ -92,6 +89,5 @@ sed -i "s/\"android\.injected\.version\.code\" => $CURRENT_MOBILE,/\"android\.in sed -i "s/^version: $CURRENT_SERVER+$CURRENT_MOBILE$/version: $NEXT_SERVER+$NEXT_MOBILE/" mobile/pubspec.yaml perl -i -p0e "s/(CFBundleShortVersionString<\/key>\s*)$CURRENT_SERVER(<\/string>)/\${1}$NEXT_SERVER\${2}/s" mobile/ios/Runner/Info.plist -./misc/release/archive-version.js "$NEXT_SERVER" echo "IMMICH_VERSION=v$NEXT_SERVER" >>"$GITHUB_ENV" diff --git a/package.json b/package.json index ad325ac493..555c66ec91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "immich-monorepo", - "version": "0.0.1", + "version": "2.5.0", "description": "Monorepo for Immich", "private": true, "packageManager": "pnpm@10.28.0+sha512.05df71d1421f21399e053fde567cea34d446fa02c76571441bfc1c7956e98e363088982d940465fd34480d4d90a0668bc12362f8aa88000a64e83d0b0e47be48",