Skip to content

Commit

Permalink
Merge branch 'quentin/releaseIosAgain' into 'master'
Browse files Browse the repository at this point in the history
chroe(ci): re-enable sdk-ios tests and release

See merge request TankerHQ/sdk-native!968
  • Loading branch information
quentinvernot committed Jun 20, 2024
2 parents 4633162 + e8b0f83 commit fb1be5b
Showing 1 changed file with 33 additions and 34 deletions.
67 changes: 33 additions & 34 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,22 +269,22 @@ bridge/compat/linux:
branch: $COMPATIBILITY_TESTS_BRIDGE_BRANCH
strategy: depend

# bridge/ios:
# stage: bridge-check
# extends:
# - .rules/bridge/auto
# - .variables/bridge-common
# needs:
# - build/ios
# - build/bridge-dotenv
# variables:
# UPSTREAM_JOB_TARGET: ios
# UPSTREAM_JOB_NAME: build/ios
# UPSTREAM_COMMIT_REF_NAME: $CI_COMMIT_REF_NAME
# trigger:
# project: TankerHQ/sdk-ios
# branch: $SDK_IOS_BRIDGE_BRANCH
# strategy: depend
bridge/ios:
stage: bridge-check
extends:
- .rules/bridge/auto
- .variables/bridge-common
needs:
- build/ios
- build/bridge-dotenv
variables:
UPSTREAM_JOB_TARGET: ios
UPSTREAM_JOB_NAME: build/ios
UPSTREAM_COMMIT_REF_NAME: $CI_COMMIT_REF_NAME
trigger:
project: TankerHQ/sdk-ios
branch: $SDK_IOS_BRIDGE_BRANCH
strategy: depend

bridge/android:
extends:
Expand Down Expand Up @@ -587,23 +587,23 @@ bridge/bump-native-compat-tests:
strategy: depend
allow_failure: true

# bridge/ios/deploy:
# extends:
# - .bridge-deploy
# - .rules/bridge-release/ios
# - .variables/bridge-common
# needs:
# - bridge/ios
# - deploy
# - build/bridge-dotenv
# variables:
# UPSTREAM_BRIDGE_STAGE: deploy
# SDK_IOS_RELEASE_VERSION: $SDK_IOS_RELEASE_VERSION
# SDK_NATIVE_CONAN_REFERENCE: tanker/$SDK_NATIVE_RELEASE_VERSION@
# trigger:
# project: TankerHQ/sdk-ios
# branch: $SDK_IOS_BRIDGE_BRANCH
# strategy: depend
bridge/ios/deploy:
extends:
- .bridge-deploy
- .rules/bridge-release/ios
- .variables/bridge-common
needs:
- bridge/ios
- deploy
- build/bridge-dotenv
variables:
UPSTREAM_BRIDGE_STAGE: deploy
SDK_IOS_RELEASE_VERSION: $SDK_IOS_RELEASE_VERSION
SDK_NATIVE_CONAN_REFERENCE: tanker/$SDK_NATIVE_RELEASE_VERSION@
trigger:
project: TankerHQ/sdk-ios
branch: $SDK_IOS_BRIDGE_BRANCH
strategy: depend

bridge/android/deploy:
extends:
Expand Down Expand Up @@ -685,4 +685,3 @@ bridge/rust/deploy:
project: TankerHQ/sdk-rust
branch: $SDK_RUST_BRIDGE_BRANCH
strategy: depend

0 comments on commit fb1be5b

Please sign in to comment.