Skip to content

Commit

Permalink
Merge pull request #440 from openedx/feanil/ubuntu_upgrade
Browse files Browse the repository at this point in the history
build: Switch to ubuntu-latest for builds
  • Loading branch information
Feanil Patel authored Sep 16, 2024
2 parents 186745a + 61aa006 commit e988250
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 21 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Nodejs
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Export CHROME_BIN Env Variable
run: export CHROME_BIN=chromium-browser
Expand All @@ -27,7 +27,7 @@ jobs:
run: export DISPLAY=:99.0

- name: Install Ruby
uses: ruby/setup-ruby@3783f195e29b74ae398d7caca108814bbafde90e
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.3

Expand All @@ -38,11 +38,15 @@ jobs:
run: bundle install

- name: Install Firefox
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends -y firefox xvfb
uses: browser-actions/setup-firefox@v1

- name: Run Gulp
uses: GabrielBB/xvfb-action@v1
with:
run: gulp default --ci

- name: Run Code Coverage
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
release:
name: Release
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
9 changes: 0 additions & 9 deletions gulp/tasks/coverage.js

This file was deleted.

2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"eslint": "^8.35.0",
"eslint-config-edx": "4.0.4",
"gulp": "^4.0.2",
"gulp-coveralls": "0.1.4",
"gulp-gh-pages": "0.5.4",
"gulp-rename": "2.0.0",
"gulp-util": "3.0.8",
Expand All @@ -54,7 +53,6 @@
"karma": "6.4.4",
"karma-chrome-launcher": "^3.1.1",
"karma-coverage": "2.2.1",
"karma-coveralls": "2.1.0",
"karma-firefox-launcher": "2.1.3",
"karma-jasmine": "5.1.0",
"karma-jasmine-html-reporter": "2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion test/karma.ci.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ module.exports = function(config) {
preprocessors: {
'src/js/**/*.js': ['coverage']
},
reporters: ['spec', 'coverage', 'coveralls']
reporters: ['spec', 'coverage']
});
};
1 change: 0 additions & 1 deletion test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ module.exports = function(config, overrideOptions) {
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-coverage',
'karma-coveralls',
'karma-sinon',
'karma-jasmine-html-reporter',
'karma-spec-reporter'
Expand Down

0 comments on commit e988250

Please sign in to comment.