From d46c4b510f525f7f0a8a1de738b168ac4e57f403 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 18 Feb 2022 14:49:55 -0600 Subject: [PATCH 1/2] clean up ci config --- .github/workflows/check-release.yml | 3 +-- .github/workflows/ci.yml | 3 +-- .github/workflows/downstream.yml | 29 +++++++++++++++++++++-------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 95eced91c..cc11b5cee 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -1,9 +1,8 @@ name: Check Release on: push: - branches: ["master"] + branches: ["main"] pull_request: - branches: ["*"] concurrency: group: check-release-${{ github.ref }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d5a7e773..4fe89e6f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,8 @@ name: ipykernel tests on: push: - branches: "master" + branches: ["main"] pull_request: - branches: "*" concurrency: group: ci-${{ github.ref }} diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index ccfa015ae..594c2701f 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -2,16 +2,15 @@ name: Test downstream projects on: push: - branches: "master" + branches: ["main"] pull_request: - branches: "*" concurrency: group: downstream-${{ github.ref }} cancel-in-progress: true jobs: - downstream1: + nbclient: runs-on: ubuntu-latest steps: @@ -21,18 +20,25 @@ jobs: - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - - name: Test nbclient + - name: Run Test uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 with: package_name: nbclient env_values: IPYKERNEL_CELL_NAME=\ - - name: Test jupyter_client + jupyter_client: + - name: Checkout + uses: actions/checkout@v2 + + - name: Base Setup + uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + + - name: Run Test uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 with: package_name: jupyter_client - downstream2: + ipyparallel: runs-on: ubuntu-latest steps: @@ -42,12 +48,19 @@ jobs: - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - - name: Test ipyparallel + - name: Run Test uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1 with: package_name: ipyparallel - - name: Test jupyter_kernel_test + jupyter_kernel_test: + - name: Checkout + uses: actions/checkout@v2 + + - name: Base Setup + uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + + - name: Run Test run: | git clone https://github.com/jupyter/jupyter_kernel_test.git cd jupyter_kernel_test From 2955fa88fb6102264c244ff4639b47c0af62fe8c Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 18 Feb 2022 14:56:35 -0600 Subject: [PATCH 2/2] fix workflow syntax --- .github/workflows/downstream.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 594c2701f..d67c532d2 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -12,7 +12,6 @@ concurrency: jobs: nbclient: runs-on: ubuntu-latest - steps: - name: Checkout uses: actions/checkout@v2 @@ -27,6 +26,8 @@ jobs: env_values: IPYKERNEL_CELL_NAME=\ jupyter_client: + runs-on: ubuntu-latest + steps: - name: Checkout uses: actions/checkout@v2 @@ -40,7 +41,6 @@ jobs: ipyparallel: runs-on: ubuntu-latest - steps: - name: Checkout uses: actions/checkout@v2 @@ -54,6 +54,8 @@ jobs: package_name: ipyparallel jupyter_kernel_test: + runs-on: ubuntu-latest + steps: - name: Checkout uses: actions/checkout@v2