Skip to content

Fix helper tool swap tests: change ssh to https url #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakubretajczykBD wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix helper tool swap tests: change ssh to https url #76

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bc311d
Fix helper tool swap tests: change ssh to https url
jakubretajczykBD Jan 30, 2026
26ff8e8
Removed redundand code
jakubretajczykBD Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions tests/swap/helper_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

base = Path(__file__).parent.resolve() / ".test_dependencies"

APP_EXCHANGE_URL = "git@github.com:LedgerHQ/app-exchange.git"
Copy link
Member

@0xMMBD 0xMMBD Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Podeślij mi jaki problem leciał przed tą zmianą. Potrzebuje mieć jakieś konkrety do opisu, gdzie chce dać:

  • Co chciałem zrobić i jaki problem występował
  • Co zrobiłem żeby to naprawić
  • Jaka jest skala zmian i czy wprowadza ona jakieś ryzyka

APP_EXCHANGE_URL = "https://github.com/LedgerHQ/app-exchange.git"
APP_EXCHANGE_DIR = base / "main/app-exchange/"
APP_EXCHANGE_CLONE_DIR = base / "app-exchange/"

APP_ETHEREUM_URL = "git@github.com:LedgerHQ/app-ethereum.git"
APP_ETHEREUM_URL = "https://github.com/LedgerHQ/app-ethereum.git"
APP_ETHEREUM_DIR = base / "libraries/app-ethereum/"
APP_ETHEREUM_CLONE_DIR = base / "app-ethereum/"

Expand Down Expand Up @@ -59,15 +59,33 @@ def run_cmd(cmd: str,

return ret.stdout.strip()

def ensure_https_git():
# Force HTTPS for all GitHub SSH URLs (incl. submodules)
run_cmd('git config --global url."https://github.com/".insteadOf git@github.com:')
run_cmd('git config --global url."https://github.com/".insteadOf ssh://git@github.com/')
Copy link
Member

@0xMMBD 0xMMBD Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to jest na pewno potrzebne jeżeli powyżej zmieniliśmy url na https:?

Copy link
Author

@jakubretajczykBD jakubretajczykBD Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

poprawione


def submodule_update_https(cwd: Path):
run_cmd("git submodule sync --recursive", cwd=cwd)
cmd = (
'git -c url."https://github.com/".insteadOf=git@github.com: '
'-c url."https://github.com/".insteadOf=ssh://git@github.com/ '
"submodule update --init --recursive"
)
run_cmd(cmd, cwd=cwd)

def clone_or_pull(repo_url: str, clone_dir: str):
# Only needed when cloning / pulling, not when building.
# By putting the import here we allow the script to be imported inside the docker image
from git import Repo

ensure_https_git()

git_dir = os.path.join(clone_dir, ".git")
if not os.path.exists(git_dir):
print(f"Cloning into {clone_dir}")
run_cmd(f"rm -rf {clone_dir}")
Repo.clone_from(repo_url, clone_dir, recursive=True)
Repo.clone_from(repo_url, clone_dir)
submodule_update_https(Path(clone_dir))
else:
print(f"Pulling latest changes in {clone_dir}")
repo = Repo(clone_dir)
Expand All @@ -77,8 +95,7 @@ def clone_or_pull(repo_url: str, clone_dir: str):

# Update submodules
print(f"Updating submodules in {clone_dir}")
run_cmd("git submodule sync", cwd=Path(clone_dir))
run_cmd("git submodule update --init --recursive", cwd=Path(clone_dir))
submodule_update_https(Path(clone_dir))

def build_app(clone_dir: str, flags: str):
cmd = f"make clean"
Expand Down
Loading