mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-16 06:28:27 +02:00
Merge commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5' into feature/6076_foss_merge
* commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5': (79 commits) finish version++ version++ Translated using Weblate (Hungarian) Translated using Weblate (Italian) Translated using Weblate (Ukrainian) Translated using Weblate (Hungarian) Translated using Weblate (Slovak) Translated using Weblate (Swedish) Translated using Weblate (Indonesian) Translated using Weblate (Albanian) Translated using Weblate (Estonian) Translated using Weblate (Estonian) updated the submodule updated SDK Update the SDK. (#7819) Prepare for new sprint finish version++ version++ fix Changelog. ... # Conflicts: # Config/AppVersion.xcconfig # Podfile # Podfile.lock # Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved # Riot/Managers/Settings/RiotSettings.swift # Riot/Modules/Analytics/Analytics.swift # Riot/Modules/Analytics/DecryptionFailure.swift # Riot/Modules/Analytics/PHGPostHogConfiguration.swift # Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewAction.swift # Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModel.swift # Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m # Riot/Modules/Settings/SettingsViewController.m # Riot/Utils/EventFormatter.m # Riot/Utils/Tools.m # RiotNSE/target.yml # fastlane/Fastfile # project.yml
This commit is contained in:
@@ -42,7 +42,7 @@ cp -R ../../../.. /tmp/$REPO_NAME
|
||||
mv /tmp/$REPO_NAME .
|
||||
else
|
||||
echo "Git clone $REPO_URL with branch/tag $TAG..."
|
||||
git clone $REPO_URL --depth=1 --branch $TAG
|
||||
git clone --recursive $REPO_URL --depth=1 --branch $TAG
|
||||
fi
|
||||
|
||||
cd $REPO_NAME
|
||||
@@ -55,11 +55,6 @@ bundle update
|
||||
# Update fastlane plugins
|
||||
bundle exec fastlane update_plugins
|
||||
|
||||
# Use appropriated dependencies according to the current branch
|
||||
if [ "$LOCAL_SOURCE" != true ]; then
|
||||
bundle exec fastlane point_dependencies_to_same_feature
|
||||
fi
|
||||
|
||||
# Build
|
||||
bundle exec fastlane app_store build_number:$BUILD_NUMBER git_tag:$TAG
|
||||
|
||||
|
||||
Reference in New Issue
Block a user