From d94d7546fc7c1f8c62276661d4d08adfe0725ae2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 4 Oct 2022 14:34:00 -0500 Subject: [PATCH 1/2] cleanup ci --- .github/workflows/check-release.yml | 48 ++--------------------------- .github/workflows/main.yml | 8 +++++ 2 files changed, 11 insertions(+), 45 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 59f48f4b..b56364dd 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: ["*"] permissions: contents: write @@ -11,52 +10,11 @@ permissions: jobs: check_release: runs-on: ubuntu-latest - strategy: - matrix: - group: [check_release, link_check] steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Install Python - uses: actions/setup-python@v2 - with: - python-version: 3.9 - architecture: "x64" - - name: Install node - uses: actions/setup-node@v2 - with: - node-version: "14.x" - - name: Get pip cache dir - id: pip-cache - run: | - echo "::set-output name=dir::$(pip cache dir)" - - name: Cache pip - uses: actions/cache@v1 - with: - path: ${{ steps.pip-cache.outputs.dir }} - key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }} - restore-keys: | - ${{ runner.os }}-pip- - ${{ runner.os }}-pip- - - name: Cache checked links - if: ${{ matrix.group == 'link_check' }} - uses: actions/cache@v2 - with: - path: ~/.cache/pytest-link-check - key: ${{ runner.os }}-linkcheck-${{ hashFiles('**/*.md', '**/*.rst') }}-md-links - restore-keys: | - ${{ runner.os }}-linkcheck- - - name: Upgrade packaging dependencies - run: | - pip install --upgrade pip setuptools wheel --user - - name: Install Dependencies - run: | - pip install -e . + - uses: actions/checkout@v2 + - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - name: Check Release if: ${{ matrix.group == 'check_release' }} uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - - name: Check Links - if: ${{ matrix.group == 'link_check' }} - uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e64f0e56..fbf820b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,6 +2,7 @@ name: CI on: push: + branches: ["main"] pull_request: jobs: @@ -71,3 +72,10 @@ jobs: pip install .[sphinx] cd docs make html SPHINXOPTS="-W" + + check-links: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1 From 8228ec1eec5cd9fc0997981f23e72fd305bde1bb Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 4 Oct 2022 14:34:30 -0500 Subject: [PATCH 2/2] use v2 check release --- .github/workflows/check-release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index b56364dd..5d11d953 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -14,7 +14,6 @@ jobs: - uses: actions/checkout@v2 - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - name: Check Release - if: ${{ matrix.group == 'check_release' }} - uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1 + uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2 with: token: ${{ secrets.GITHUB_TOKEN }}