diff --git a/.github/workflows/infra_tests.yml b/.github/workflows/infra_tests.yml index 8c5b9b07d..0641e6cb3 100644 --- a/.github/workflows/infra_tests.yml +++ b/.github/workflows/infra_tests.yml @@ -17,10 +17,11 @@ jobs: - name: Setup python environment uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies run: | + python -m pip install --upgrade pip pip install -r infra/ci/requirements.txt pip install -r infra/build/functions/requirements.txt @@ -31,7 +32,6 @@ jobs: gcloud components install beta cloud-datastore-emulator gcloud info - - name: Run infra tests run: python infra/presubmit.py infra-tests diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 7f1e9e161..0ab4f4f43 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -14,10 +14,11 @@ jobs: - name: Setup python environment uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies run: | + python -m pip install --upgrade pip pip install -r infra/ci/requirements.txt pip install -r infra/build/functions/requirements.txt diff --git a/.github/workflows/project_tests.yml b/.github/workflows/project_tests.yml index 3c401dcf2..4c78ee1e5 100644 --- a/.github/workflows/project_tests.yml +++ b/.github/workflows/project_tests.yml @@ -54,10 +54,12 @@ jobs: - name: Setup python environment uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies - run: pip install -r infra/ci/requirements.txt + run: | + python -m pip install --upgrade pip + pip install -r infra/ci/requirements.txt - name: Run project tests run: python infra/ci/build.py diff --git a/infra/ci/build.py b/infra/ci/build.py index 7d695acab..15dd4fb61 100755 --- a/infra/ci/build.py +++ b/infra/ci/build.py @@ -88,7 +88,7 @@ def check_build(project, engine, sanitizer, architecture): def should_build(project_yaml): - """Is the build specified by travis enabled in the |project_yaml|?""" + """Return bool on if the build specified is enabled in the project.yaml.""" def is_enabled(env_var, yaml_name, defaults): """Is the value of |env_var| enabled in |project_yaml| (in the |yaml_name| @@ -139,7 +139,7 @@ def build_project(project): def main(): - """Build modified projects on travis.""" + """Build modified projects.""" projects = get_modified_buildable_projects() failed_projects = [] for project in projects: diff --git a/infra/ci/requirements.txt b/infra/ci/requirements.txt index 2ddcb47d4..2a21c2af5 100644 --- a/infra/ci/requirements.txt +++ b/infra/ci/requirements.txt @@ -1,6 +1,6 @@ # Requirements for submitting code changes to infra/ (needed by presubmit.py). -pylint==2.4.4 -yapf==0.28.0 -PyYAML==5.1 -pyfakefs==3.7.1 parameterized==0.7.4 +pyfakefs==4.1.0 +pylint==2.5.3 +PyYAML==5.3.1 +yapf==0.30.0