Skip to content

Commit

Permalink
EBR-91 Separate the SonarCloud check in a different step, outside of …
Browse files Browse the repository at this point in the history
…the python_matrix loop
  • Loading branch information
liadomide committed Sep 10, 2024
1 parent d5c3332 commit 4bff019
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 39 deletions.
75 changes: 37 additions & 38 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
pull_request:
types: [opened, synchronize, reopened]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
Expand All @@ -29,12 +26,12 @@ jobs:
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Install dependencies
run: python -m pip install -U "jupyterlab>=4.0.0,<5" check-manifest pyunicore pytest pytest-mock pytest-cov
run: python -m pip install -U "jupyterlab>=4.0.0,<5" check-manifest pyunicore pytest pytest-mock build

- name: Install Node.js dependencies
run: jlpm install

- name: Test the extension
- name: Test the extension with jlpm
run: |
set -eux
jlpm run test
Expand All @@ -48,49 +45,26 @@ jobs:
jlpm run build
python -m pip install .[test]
pytest -vv -r ap tvbextunicore
jupyter server extension list
jupyter server extension list 2>&1 | grep -ie "tvbextunicore.*OK"
jupyter labextension list
jupyter labextension list 2>&1 | grep -ie "tvb-ext-unicore.*OK"
python -m jupyterlab.browser_check
pip install build
python -m build --sdist
cp dist/*.tar.gz myextension.tar.gz
pip uninstall -y "tvb-ext-unicore" jupyterlab
rm -rf myextension
- name: Package the extension
- name: Run Python & JS tests
run: |
set -eux
pip install build
python -m build
pip uninstall -y "tvb-ext-unicore" jupyterlab
- name: Run tests
run: |
pytest tvbextunicore -r ap
- name: Compute coverage
run: |
pytest -v --cov --cov-report=xml
- name: Run JS tests
run: |
yarn test
- name: Compute JS coverage
- name: Package the extension
run: |
yarn test --coverage
set -eux
- name: SonarCloud Scan
uses: sonarsource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
pip install build
python -m build
pip uninstall -y "tvb-ext-unicore" jupyterlab
- name: Upload extension packages
uses: actions/upload-artifact@v4
Expand All @@ -99,6 +73,33 @@ jobs:
path: dist/tvbextunicore*
if-no-files-found: error

sonar_cloud:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Base Setup
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Install dependencies
run: python -m pip install -U "jupyterlab>=4.0.0,<5" check-manifest pyunicore pytest pytest-mock pytest-cov

- name: Compute coverage
run: |
python -m pip install .[test]
pytest -v --cov --cov-report=xml
yarn test --coverage
- name: SonarCloud Scan
uses: sonarsource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

test_isolated:
needs: build
runs-on: ubuntu-latest
Expand All @@ -109,9 +110,11 @@ jobs:
with:
python-version: '3.11'
architecture: 'x64'

- uses: actions/download-artifact@v4
with:
name: extension-artifacts-3.11

- name: Install and Test
run: |
set -eux
Expand All @@ -121,10 +124,6 @@ jobs:
pip install "jupyterlab>=4.0.0,<5" tvbextunicore*.whl
jupyter server extension list
jupyter server extension list 2>&1 | grep -ie "tvbextunicore.*OK"
jupyter labextension list
jupyter labextension list 2>&1 | grep -ie "tvb-ext-unicore.*OK"
python -m jupyterlab.browser_check --no-browser-test
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tvb-ext-unicore",
"version": "2.0.0",
"version": "3.0.0",
"description": "TVB Widgets - A Unicore Lab extension",
"keywords": [
"jupyter",
Expand Down

0 comments on commit 4bff019

Please sign in to comment.