From 0a82a350d7af2a06e3bb67936a2ecf0acce07230 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 3 Jul 2022 13:05:44 +0900 Subject: [PATCH 01/10] empty commit From 2b0e0f40cbfd06e6a09d781ce1341a9563ae21df Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 3 Jul 2022 13:06:13 +0900 Subject: [PATCH 02/10] Temporarily disable concurrency --- .github/workflows/ci_test-conda.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index 0466a83760338..a1dcb1c597c8a 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -7,10 +7,6 @@ on: # Trigger the workflow on push or pull request, but only for the master bra pull_request: branches: [master, "release/*"] -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }} - cancel-in-progress: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }} - defaults: run: shell: bash -l {0} From 3254ea179c944008b53933feda9df4c5919ed224 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 3 Jul 2022 13:10:07 +0900 Subject: [PATCH 03/10] Always trigger on this branch --- .github/workflows/ci_test-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index a1dcb1c597c8a..127bf1cdfa938 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -5,7 +5,7 @@ on: # Trigger the workflow on push or pull request, but only for the master bra push: branches: [master, "release/*"] pull_request: - branches: [master, "release/*"] + branches: [master, "release/*", "1.6.5-draft"] defaults: run: From 4ecd5d6810d7df056332cf8739e42480b033c1fe Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 3 Jul 2022 13:13:01 +0900 Subject: [PATCH 04/10] Use new wandb --- .github/workflows/ci_test-conda.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index 127bf1cdfa938..23dee94627b73 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -58,6 +58,7 @@ jobs: pip list # sanity check python requirements/check-avail-extras.py + pip install wandb -U - name: Pull legacy checkpoints run: bash .actions/pull_legacy_checkpoints.sh From 9135818bb96ec71bdb85ba6877739827a21de538 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 3 Jul 2022 13:14:39 +0900 Subject: [PATCH 05/10] Narrow test case --- .github/workflows/ci_test-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index 23dee94627b73..21cb85a3e4e78 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -65,7 +65,7 @@ jobs: - name: UnitTests run: | - coverage run --source pytorch_lightning -m pytest --timeout 150 tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml + coverage run --source pytorch_lightning -m pytest --timeout 150 tests/loggers/test_all.py -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml - name: Upload pytest results uses: actions/upload-artifact@v2 From 81380fb25fd6be791d97f2ab6653ee825c3c0492 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 3 Jul 2022 13:14:56 +0900 Subject: [PATCH 06/10] Revert "Use new wandb" This reverts commit 4ecd5d6810d7df056332cf8739e42480b033c1fe. --- .github/workflows/ci_test-conda.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index 21cb85a3e4e78..8d681b6da7d91 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -58,7 +58,6 @@ jobs: pip list # sanity check python requirements/check-avail-extras.py - pip install wandb -U - name: Pull legacy checkpoints run: bash .actions/pull_legacy_checkpoints.sh From d3a1706a50b07f2b49e3985168d4233a95cce052 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Tue, 5 Jul 2022 03:51:28 +0900 Subject: [PATCH 07/10] Update repo name --- .github/workflows/ci_test-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index 8d681b6da7d91..467594a6261f7 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -27,7 +27,7 @@ jobs: timeout-minutes: 30 steps: - name: Workaround for https://github.com/actions/checkout/issues/760 - run: git config --global --add safe.directory /__w/pytorch-lightning/pytorch-lightning + run: git config --global --add safe.directory /__w/lightning/lightning - uses: actions/checkout@v2 From c6185f1e5efafc20198bc2c2806fc187304b61cd Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Tue, 5 Jul 2022 04:00:47 +0900 Subject: [PATCH 08/10] Revert "Narrow test case" This reverts commit 9135818bb96ec71bdb85ba6877739827a21de538. --- .github/workflows/ci_test-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index 467594a6261f7..c73a504cf1e44 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -64,7 +64,7 @@ jobs: - name: UnitTests run: | - coverage run --source pytorch_lightning -m pytest --timeout 150 tests/loggers/test_all.py -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml + coverage run --source pytorch_lightning -m pytest --timeout 150 tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml - name: Upload pytest results uses: actions/upload-artifact@v2 From 0057b9c30fc5c76eb16702f265cd25b8dcd37aa5 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Tue, 5 Jul 2022 04:01:45 +0900 Subject: [PATCH 09/10] Revert "Always trigger on this branch" This reverts commit 3254ea179c944008b53933feda9df4c5919ed224. --- .github/workflows/ci_test-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index c73a504cf1e44..889c0cf9faa6c 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -5,7 +5,7 @@ on: # Trigger the workflow on push or pull request, but only for the master bra push: branches: [master, "release/*"] pull_request: - branches: [master, "release/*", "1.6.5-draft"] + branches: [master, "release/*"] defaults: run: From 830a0fdaf78e19fa4e6425910886599e6e95e5a4 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Tue, 5 Jul 2022 04:01:50 +0900 Subject: [PATCH 10/10] Revert "Temporarily disable concurrency" This reverts commit 2b0e0f40cbfd06e6a09d781ce1341a9563ae21df. --- .github/workflows/ci_test-conda.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index 889c0cf9faa6c..1064c7a095d54 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -7,6 +7,10 @@ on: # Trigger the workflow on push or pull request, but only for the master bra pull_request: branches: [master, "release/*"] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }} + cancel-in-progress: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }} + defaults: run: shell: bash -l {0}