From ca32fc041afb07602a2e6b498a83c2c456f06250 Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Thu, 24 Jun 2021 06:57:22 -0500 Subject: [PATCH 1/7] add a bleeding edge cron job (that currently also runs on PRs) --- .github/workflows/bleeding-edge.yml | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/bleeding-edge.yml diff --git a/.github/workflows/bleeding-edge.yml b/.github/workflows/bleeding-edge.yml new file mode 100644 index 0000000..5403fb1 --- /dev/null +++ b/.github/workflows/bleeding-edge.yml @@ -0,0 +1,45 @@ +name: Bleeding Edge dependencies + +on: + pull_request: + schedule: + - cron: '0 0 * * 5' + +env: + INSTALL_EDM_VERSION: 3.2.3 + +jobs: + + # Test against EDM packages + test-with-edm: + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - name: Cache EDM packages + uses: actions/cache@v2 + with: + path: ~/.cache + key: ${{ runner.os }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }} + - name: Set up EDM + uses: enthought/setup-edm-action@v1 + with: + edm-version: ${{ env.INSTALL_EDM_VERSION }} + - name: Install click to the default EDM environment + run: edm install -y wheel click coverage + - name: Install test environment + run: edm run -- python etstool.py install + - name: Remove dependencies obtanied with edm + run: | + edm plumbing remove-package --environment bootstrap --force traits + edm plumbing remove-package --environment bootstrap --force scipy + - name: Re-install dependencies using pip + run: | + edm run -e bootstrap -- python -m pip install --force-reinstall "git+http://github.com/enthought/traits.git#egg=traits" + edm run -e bootstrap -- python -m pip install --force-reinstall scipy + - name: Run tests + uses: GabrielBB/xvfb-action@v1 + with: + run: edm run -- python etstool.py test From 6d7b6af8e8f7acac821f27d67c895abbd967aff8 Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Thu, 24 Jun 2021 06:58:16 -0500 Subject: [PATCH 2/7] add workflow_dispatch to both cron jobs --- .github/workflows/bleeding-edge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/bleeding-edge.yml b/.github/workflows/bleeding-edge.yml index 5403fb1..7c6b69a 100644 --- a/.github/workflows/bleeding-edge.yml +++ b/.github/workflows/bleeding-edge.yml @@ -1,6 +1,8 @@ name: Bleeding Edge dependencies on: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: pull_request: schedule: - cron: '0 0 * * 5' From e27cdabc4601bc5b1df53bcf9780b5ed2ef04fe3 Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Thu, 24 Jun 2021 06:59:35 -0500 Subject: [PATCH 3/7] add workflow_dispatch to test-with-edm as well --- .github/workflows/test-with-edm.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index f1e6665..bd8d975 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -1,6 +1,8 @@ name: Test with EDM on: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: pull_request: schedule: - cron: '0 0 * * 5' From c847e5ff730278e253445d06e898339515e7c6fa Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Thu, 24 Jun 2021 07:08:32 -0500 Subject: [PATCH 4/7] remove ref to matrix.toolkit --- .github/workflows/bleeding-edge.yml | 2 +- .github/workflows/test-with-edm.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bleeding-edge.yml b/.github/workflows/bleeding-edge.yml index 7c6b69a..7b3b11a 100644 --- a/.github/workflows/bleeding-edge.yml +++ b/.github/workflows/bleeding-edge.yml @@ -24,7 +24,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.cache - key: ${{ runner.os }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }} + key: ${{ runner.os }}-${{ hashFiles('etstool.py') }} - name: Set up EDM uses: enthought/setup-edm-action@v1 with: diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml index bd8d975..4493a07 100644 --- a/.github/workflows/test-with-edm.yml +++ b/.github/workflows/test-with-edm.yml @@ -24,7 +24,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.cache - key: ${{ runner.os }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }} + key: ${{ runner.os }}-${{ hashFiles('etstool.py') }} - name: Set up EDM uses: enthought/setup-edm-action@v1 with: From 13e44438ecdfa1f1b86a257acd2ae2dc5b6afc32 Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Thu, 24 Jun 2021 07:13:48 -0500 Subject: [PATCH 5/7] rename bleeding edge job --- .github/workflows/bleeding-edge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bleeding-edge.yml b/.github/workflows/bleeding-edge.yml index 7b3b11a..5904c1f 100644 --- a/.github/workflows/bleeding-edge.yml +++ b/.github/workflows/bleeding-edge.yml @@ -13,7 +13,7 @@ env: jobs: # Test against EDM packages - test-with-edm: + test-bleeding-edge: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] From 948b0399c4f9bb7a29917a714fbc6f3b2b28886d Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Thu, 24 Jun 2021 07:15:38 -0500 Subject: [PATCH 6/7] no bootstrap env --- .github/workflows/bleeding-edge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bleeding-edge.yml b/.github/workflows/bleeding-edge.yml index 5904c1f..64a747f 100644 --- a/.github/workflows/bleeding-edge.yml +++ b/.github/workflows/bleeding-edge.yml @@ -35,12 +35,12 @@ jobs: run: edm run -- python etstool.py install - name: Remove dependencies obtanied with edm run: | - edm plumbing remove-package --environment bootstrap --force traits - edm plumbing remove-package --environment bootstrap --force scipy + edm plumbing remove-package --force traits + edm plumbing remove-package --force scipy - name: Re-install dependencies using pip run: | - edm run -e bootstrap -- python -m pip install --force-reinstall "git+http://github.com/enthought/traits.git#egg=traits" - edm run -e bootstrap -- python -m pip install --force-reinstall scipy + edm run -- python -m pip install --force-reinstall "git+http://github.com/enthought/traits.git#egg=traits" + edm run -- python -m pip install --force-reinstall scipy - name: Run tests uses: GabrielBB/xvfb-action@v1 with: From fba49e2088ed3341edc4434396928d06c1ed396a Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Thu, 24 Jun 2021 07:55:00 -0500 Subject: [PATCH 7/7] stop running bleeding edge on PRs --- .github/workflows/bleeding-edge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/bleeding-edge.yml b/.github/workflows/bleeding-edge.yml index 64a747f..ac8c570 100644 --- a/.github/workflows/bleeding-edge.yml +++ b/.github/workflows/bleeding-edge.yml @@ -3,7 +3,6 @@ name: Bleeding Edge dependencies on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - pull_request: schedule: - cron: '0 0 * * 5'