Skip to content

Commit

Permalink
fix: fix ci (#1039)
Browse files Browse the repository at this point in the history
Co-authored-by: Mohammad Ahtasham ul Hassan <[email protected]>
  • Loading branch information
awais786 and aht007 authored Apr 6, 2022
1 parent d5f43c9 commit 6406901
Show file tree
Hide file tree
Showing 8 changed files with 22,224 additions and 10,197 deletions.
82 changes: 46 additions & 36 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,48 +6,58 @@ on:
- master
pull_request:
branches:
- '**'
- "**"

jobs:
run_tests:
name: Tests
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ['ubuntu-20.04']
python-version: ['3.8']
node-version: ['12','16']
os: ["ubuntu-20.04"]
python-version: ["3.8"]
node-version: ["16"]
toxenv:
['django32-drflatest', 'django40-drflatest', 'quality', 'pii_check', 'version_check', 'translations', 'js_tests', 'js_lint', 'rst_validation']
[
"django32-drflatest",
"quality",
"pii_check",
"version_check",
"js_tests",
"js_lint",
"rst_validation",
"translations",
]
steps:
- uses: actions/checkout@v1
- name: Setup python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Setup node
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Set display to virtual frame buffer
run: export DISPLAY=:99.0

- name: Install pip
run: pip install -r requirements/pip.txt

- name: Install requirements
run: pip install -r requirements/ci.txt

- name: Run tests
env:
TOXENV: ${{ matrix.toxenv }}
run: tox

- name: Run Coverage
if: matrix.toxenv == 'django32-drflatest'
uses: codecov/codecov-action@v1
with:
flags: unittests
fail_ci_if_error: true
- uses: actions/checkout@v1
- name: Setup python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Setup node
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Set display to virtual frame buffer
run: export DISPLAY=:99.0

- name: Install pip
run: pip install -r requirements/pip.txt

- name: Install requirements
run: pip install -r requirements/ci.txt

- name: Run tests
env:
TOXENV: ${{ matrix.toxenv }}
run: tox

- name: Run Coverage
if: matrix.toxenv == 'django32-drflatest'
uses: codecov/codecov-action@v1
with:
flags: unittests
fail_ci_if_error: true
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ Change Log
Unreleased
~~~~~~~~~~

[4.10.1] - 2022-04-06
* Fixed the syntax error in CI workflow to make it work.
* Removed Django40 tests for now which will be enabled in subsequent PR

[4.10.0] - 2022-04-04
~~~~~~~~~~~~~~~~~~~~~
* Remove IDV as a prerequisite to proctored exams
Expand Down
2 changes: 1 addition & 1 deletion edx_proctoring/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"""

# Be sure to update the version number in edx_proctoring/package.json
__version__ = '4.10.0'
__version__ = '4.10.1'

default_app_config = 'edx_proctoring.apps.EdxProctoringConfig' # pylint: disable=invalid-name
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gulp.task('tdd', function(done) {
}, done);
});

gulp.task('default', ['tdd']);
gulp.task('default', gulp.series('tdd'));


/**
Expand Down
3 changes: 1 addition & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ module.exports = function(config) {
// plugins required for running the karma tests
plugins: [
'karma-jasmine',
'karma-jasmine-jquery',
'karma-jasmine-jquery',
'karma-jasmine-jquery-2',
'karma-chrome-launcher',
'karma-phantomjs-launcher',
'karma-coverage',
Expand Down
Loading

0 comments on commit 6406901

Please sign in to comment.