From d7d380e0a0a9c1f130debf924aed1930a285ca5e Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Tue, 14 Sep 2021 11:19:55 -0700 Subject: [PATCH 1/4] Whoops broke the build --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9dc9a24bbedc..3e96bc695797 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,7 @@ on: - 'release' - 'release/*' - 'release-*' + - fix-build-* env: NODE_VERSION: 12.15.0 @@ -119,6 +120,7 @@ jobs: python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt # We need to have debugpy so that tests relying on it keep passing, but we don't need install_debugpy's logic in the test phase. python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy + python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r ./jedils_requirements.txt - name: Install test requirements run: python -m pip install --upgrade -r build/test-requirements.txt From 705f633317fb6b13dbe7df19ffa5cc0c9988fd37 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Tue, 14 Sep 2021 11:22:00 -0700 Subject: [PATCH 2/4] Run the workflow on PR to verify (disable PR one) --- .github/workflows/build.yml | 2 +- .github/workflows/pr-check.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e96bc695797..54e255f8b95d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,13 +1,13 @@ name: Build on: + pull_request: push: branches: - 'main' - 'release' - 'release/*' - 'release-*' - - fix-build-* env: NODE_VERSION: 12.15.0 diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index d13e55ced2a5..cee114153353 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -1,7 +1,6 @@ name: PR/CI Check on: - pull_request: push: branches-ignore: - main From 8febf2b075b3e95ba69f64ed91a0824bbd586724 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Tue, 14 Sep 2021 12:11:57 -0700 Subject: [PATCH 3/4] Install JediLSP for Python 3 only --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54e255f8b95d..d1858dcdc557 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,7 +120,10 @@ jobs: python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt # We need to have debugpy so that tests relying on it keep passing, but we don't need install_debugpy's logic in the test phase. python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy - python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r ./jedils_requirements.txt + + - name: Install Jedi LSP requirements + run: python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r ./jedils_requirements.txt + if: startsWith(matrix.python, 3.) - name: Install test requirements run: python -m pip install --upgrade -r build/test-requirements.txt From 92c9fdae967eb41f8e56f0683da667014be689b3 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Tue, 14 Sep 2021 12:39:54 -0700 Subject: [PATCH 4/4] Undo pr check testing changes --- .github/workflows/build.yml | 1 - .github/workflows/pr-check.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1858dcdc557..72a3440a62d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,6 @@ name: Build on: - pull_request: push: branches: - 'main' diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index cee114153353..d13e55ced2a5 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -1,6 +1,7 @@ name: PR/CI Check on: + pull_request: push: branches-ignore: - main