diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 084ca38aca..d5ff1b4716 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -150,7 +150,7 @@ jobs: uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2.6.2 with: draft: true - prerelease: ${{ contains(needs.bump_version.outputs.version, '-rc.') }} + prerelease: ${{ inputs.rc == 'true' }} tag_name: ${{ needs.bump_version.outputs.version }} token: ${{ steps.generate-token.outputs.token }} generate_release_notes: true diff --git a/misc/release/pump-version.sh b/misc/release/pump-version.sh index 3a8721520b..4ca8cdbbb9 100755 --- a/misc/release/pump-version.sh +++ b/misc/release/pump-version.sh @@ -148,9 +148,9 @@ fi sed -i "s/\"android\.injected\.version\.name\" => \"$CURRENT_SERVER\",/\"android\.injected\.version\.name\" => \"$NEXT_SERVER\",/" mobile/android/fastlane/Fastfile sed -i "s/\"android\.injected\.version\.code\" => $CURRENT_MOBILE,/\"android\.injected\.version\.code\" => $NEXT_MOBILE,/" mobile/android/fastlane/Fastfile sed -i "s/^version: $CURRENT_SERVER+$CURRENT_MOBILE$/version: $NEXT_SERVER+$NEXT_MOBILE/" mobile/pubspec.yaml -# iOS marketing version cannot contain a pre-release suffix; strip -rc.N before writing the plist. +# iOS marketing version cannot contain a pre-release suffix; the plist always holds the base version. IOS_NEXT="${NEXT_SERVER%-rc.*}" -perl -i -p0e "s/(CFBundleShortVersionString<\/key>\s*)$CURRENT_SERVER(<\/string>)/\${1}$IOS_NEXT\${2}/s" mobile/ios/Runner/Info.plist +perl -i -p0e "s/(CFBundleShortVersionString<\/key>\s*)$CURRENT_BASE(<\/string>)/\${1}$IOS_NEXT\${2}/s" mobile/ios/Runner/Info.plist echo "IMMICH_VERSION=v$NEXT_SERVER" >>"$GITHUB_ENV"