Skip to content

Commit

Permalink
Revert "[merge] Re-apply SC build/release changes to scripts"
Browse files Browse the repository at this point in the history
This reverts commit 65469a6.
  • Loading branch information
SpiritCroc committed Mar 11, 2024
1 parent 65469a6 commit 7fb0770
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions scripts/build-rust-for-target.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def execute_build_script(script_directory: str, sdk_path: str, module: Module, t

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/SchildiChat/matrix-rust-sdk.git"
sdk_git_url = "https://github.com/matrix-org/matrix-rust-sdk.git"

if args.path_to_sdk:
sdk_path = args.path_to_sdk
Expand Down Expand Up @@ -127,4 +127,4 @@ def execute_build_script(script_directory: str, sdk_path: str, module: Module, t
env_file_path = os.getenv('GITHUB_ENV')
if os.path.exists(env_file_path):
with open(env_file_path, "a") as file:
file.write(f"RUST_SDK_PATH={sdk_path}")
file.write(f"RUST_SDK_PATH={sdk_path}")
12 changes: 6 additions & 6 deletions scripts/release_sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ def get_asset_path(root_project_dir: str, module: Module) -> str:

def get_publish_task(module: Module) -> str:
if module == Module.SDK:
return ":sdk:sdk-android:publish"
return ":sdk:sdk-android:publishToSonatype"
elif module == Module.CRYPTO:
return ":crypto:crypto-android:publish"
return ":crypto:crypto-android:publishToSonatype"
else:
raise ValueError(f"Unknown module: {module}")


def run_publish_close_and_release_tasks(root_project_dir, publish_task: str):
gradle_command = f"./gradlew {publish_task}"
gradle_command = f"./gradlew {publish_task} closeAndReleaseStagingRepository"
result = subprocess.run(gradle_command, shell=True, cwd=root_project_dir, text=True)
if result.returncode != 0:
raise Exception(f"Gradle tasks failed with return code {result.returncode}")
Expand Down Expand Up @@ -219,13 +219,13 @@ def main(args: argparse.Namespace):
print(f"Commit message: {commit_message}")
commit_and_push_changes(project_root, commit_message)

release_name = f"sc-{args.module.name.lower()}-v{args.version}"
release_notes = f"https://github.com/SchildiChat/matrix-rust-sdk/tree/{args.linkable_ref}"
release_name = f"{args.module.name.lower()}-v{args.version}"
release_notes = f"https://github.com/matrix-org/matrix-rust-sdk/tree/{args.linkable_ref}"
asset_path = get_asset_path(project_root, args.module)
asset_name = get_asset_name(args.module)
create_github_release(
github_token,
"https://api.github.com/repos/SchildiChat/matrix-rust-components-kotlin",
"https://api.github.com/repos/matrix-org/matrix-rust-components-kotlin",
release_name,
release_name,
release_notes,
Expand Down

0 comments on commit 7fb0770

Please sign in to comment.