From 951ce045cdefecb7df4bf2a9cded78cfe142a0e5 Mon Sep 17 00:00:00 2001 From: Lukas Puehringer Date: Thu, 2 Mar 2023 09:35:14 +0100 Subject: [PATCH] Adopt securesystemslib branch rename master-> main Signed-off-by: Lukas Puehringer --- .github/workflows/_test.yml | 4 ++-- tox.ini | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 7fbb904d..8b40e395 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false # Run regular TUF tests on each OS/Python combination, plus special tests - # (sslib master) and linters on Linux/Python3.x only. + # (sslib main) and linters on Linux/Python3.x only. matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] os: [ubuntu-latest, macos-latest, windows-latest] @@ -18,7 +18,7 @@ jobs: include: - python-version: 3.x os: ubuntu-latest - toxenv: with-sslib-master + toxenv: with-sslib-main experimental: true - python-version: 3.x os: ubuntu-latest diff --git a/tox.ini b/tox.ini index 43a86d88..80ef1bfb 100644 --- a/tox.ini +++ b/tox.ini @@ -30,11 +30,11 @@ install_command = python3 -m pip install {opts} {packages} # Workaround https://github.com/tox-dev/tox/issues/2801 (python3 not allowed in Windows) allowlist_externals = python3 -# Develop test env to run tests against securesystemslib's master branch -# Must to be invoked explicitly with, e.g. `tox -e with-sslib-master` -[testenv:with-sslib-master] +# Develop test env to run tests against securesystemslib's main branch +# Must to be invoked explicitly with, e.g. `tox -e with-sslib-main` +[testenv:with-sslib-main] commands_pre = - python3 -m pip install --force-reinstall git+https://github.com/secure-systems-lab/securesystemslib.git@master#egg=securesystemslib[crypto,pynacl] + python3 -m pip install --force-reinstall git+https://github.com/secure-systems-lab/securesystemslib.git@main#egg=securesystemslib[crypto,pynacl] commands = python3 -m coverage run aggregate_tests.py