Merge branch 'jrm/bump' into 'master'

chore(ci): bump gitlab-ci-files See merge request TankerHQ/sdk-rust!42
TankerHQ · Jun 21, 2021 · f2cdd51 · f2cdd51
2 parents 4a5fbaa + c3544b8
commit f2cdd51
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 include:
   project: TankerHQ/gitlab-ci-files
   file: /rust.yml
-  ref: ecfaa4031b36380595405ca7078f73daf08c6b1b
+  ref: 874483a45e99037b888688c0c3d0fb6a186da6b0
 
 check/native-from-sources/linux:
   extends:
@@ -117,11 +117,3 @@ deploy:
   release:
     description: sdk-rust v$SDK_RUST_RELEASE_VERSION
     tag_name: v$SDK_RUST_RELEASE_VERSION
-
-mirror:
-  extends:
-    - .deploy
-    - .tags/linux
-    - .rules/mirror
-  script:
-    - poetry run python run-ci.py mirror
diff --git a/run-ci.py b/run-ci.py
@@ -297,7 +297,6 @@ def main() -> None:
     deploy_parser = subparsers.add_parser("deploy")
     deploy_parser.add_argument("--version", required=True)
     deploy_parser.add_argument("--registry", required=True)
-    subparsers.add_parser("mirror")
 
     args = parser.parse_args()
     if args.home_isolation:
@@ -328,8 +327,6 @@ def main() -> None:
             pipeline_id=args.pipeline_id,
             job_name=args.job_name,
         )
-    elif args.command == "mirror":
-        tankerci.git.mirror(github_url="[email protected]:TankerHQ/sdk-rust")
     else:
         parser.print_help()
         sys.exit(1)

diff --git a/src/ctanker.rs b/src/ctanker.rs
@@ -98,7 +98,7 @@ pub async fn create(options: Options) -> Result<CTankerPtr, Error> {
         .unwrap_or_else(|| CString::new(RUST_SDK_TYPE).unwrap());
     let sdk_version = CString::new(RUST_SDK_VERSION).unwrap();
     let coptions = tanker_options {
-        version: 2,
+        version: 3,
         app_id: options.app_id.as_ptr(),
         url: options
             .url
@@ -108,6 +108,9 @@ pub async fn create(options: Options) -> Result<CTankerPtr, Error> {
         writable_path: options.writable_path.as_ptr(),
         sdk_type: sdk_type.as_ptr(),
         sdk_version: sdk_version.as_ptr(),
+        http_send_request: None,
+        http_cancel_request: None,
+        http_data: std::ptr::null_mut(),
     };
 
     let fut = unsafe { CFuture::new(tanker_create(&coptions)) };

diff --git a/tests/tanker_tests.rs b/tests/tanker_tests.rs
@@ -71,7 +71,7 @@ async fn has_correct_device_list() -> Result<(), Error> {
 
     let list = tanker.device_list().await?;
     assert_eq!(list.len(), 1);
-    assert_eq!(list[0].revoked, false);
+    assert!(!list[0].revoked);
     assert_eq!(list[0].id, tanker.device_id().unwrap());
 
     tanker.stop().await