Improve build times while building the SDK (#13)

* Try to improve caching

Author: jmartinesp

.github/workflows/release_sdk.yml

@@ -11,7 +11,6 @@ on:
         description: 'The new version for the sdk library.'
         required: true
 
-
 jobs:
   build_native:
     name: Build and generate sdk aar
@@ -21,11 +20,28 @@ jobs:
       group: ${{ github.ref }}-${{ github.job }}
       cancel-in-progress: true
 
+    env:
+      RUST_SDK_PATH: "./matrix-rust-sdk"
+
     steps:
 
       - name: Checkout this repo
         uses: actions/checkout@v3
 
+      - name: Checkout matrix rust sdk repo
+        uses: actions/checkout@v3
+        with:
+          repository: "matrix-org/matrix-rust-sdk"
+          ref: ${{ github.event.inputs.rust-checkout-ref }}
+          path: ${{ env.RUST_SDK_PATH }}
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' || github.ref == 'main' }}
+          cache-on-failure: true
+          workspaces: |
+            ${{ env.RUST_SDK_PATH }} -> target
+
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
@@ -41,16 +57,6 @@ jobs:
         with:
           ndk-version: r25c
 
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
       - name: Install Rust
         uses: dtolnay/rust-toolchain@nightly
 
@@ -91,4 +97,4 @@ jobs:
           SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
           GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          python3 ./scripts/release.py --module SDK --version ${{ github.event.inputs.sdk-version }} --ref ${{ github.event.inputs.rust-checkout-ref }}
+          python3 ./scripts/release.py --module SDK --version ${{ github.event.inputs.sdk-version }} --ref ${{ github.event.inputs.rust-checkout-ref }} --path-to-sdk $RUST_SDK_PATH --skip-clone

scripts/release.py

@@ -8,7 +8,6 @@
 from enum import Enum, auto
 from tempfile import TemporaryDirectory
 
-
 class Module(Enum):
     SDK = auto()
     CRYPTO = auto()
@@ -226,13 +225,24 @@ def run_publish_close_and_release_tasks(root_project_dir, publish_task: str):
                     help="Version as a string (e.g. '1.0.0')")
 parser.add_argument("-r", "--ref", type=str, required=True,
                     help="Ref to the git matrix-rust-sdk (branch name, commit or tag)")
+parser.add_argument("-p", "--path-to-sdk", type=str, required=False,
+                    help="Choose a module (SDK or CRYPTO)")
+parser.add_argument("-s", "--skip-clone", action="store_true", required=False,
+                    help="Skip cloning the Rust SDK repository")
 
 args = parser.parse_args()
 
 current_dir = os.path.dirname(os.path.abspath(__file__))
 project_root = os.path.dirname(current_dir).rstrip(os.sep)
 sdk_git_url = "https://github.com/matrix-org/matrix-rust-sdk.git"
 
+if args.path_to_sdk:
+    sdk_path = args.path_to_sdk
+else:
+    sdk_path = TemporaryDirectory().name
+
+skip_clone = args.skip_clone
+
 print(f"Project Root Directory: {project_root}")
 print(f"Selected module: {args.module}")
 print(f"Version: {args.version}")
@@ -248,10 +258,11 @@ def run_publish_close_and_release_tasks(root_project_dir, publish_task: str):
         f"The provided version ({args.version}) is not higher than the previous version ({major}.{minor}.{patch}) so bump the version before retrying.")
     exit(0)
 
-with TemporaryDirectory() as sdk_path:
+if skip_clone is False:
     clone_repo_and_checkout_ref(sdk_path, sdk_git_url, args.ref)
-    linkable_ref = get_linkable_ref(sdk_path, args.ref)
-    execute_build_script(current_dir, sdk_path, args.module)
+
+linkable_ref = get_linkable_ref(sdk_path, args.ref)
+execute_build_script(current_dir, sdk_path, args.module)
 
 override_version_in_build_version_file(build_version_file_path, args.version)