Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMS 549: dev setup fixes #197

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
41 changes: 21 additions & 20 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,24 @@ jobs:
javascript_tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.2
- name: Install sass
run: gem install sass
- uses: actions/setup-node@v1
with:
node-version: 6.11.4
- name: Install grunt-cli
run: npm install grunt-cli
- name: Install bower
run: npm install -g bower
- name: Install dependencies
run: npm install
- name: Build
run: script/bootstrap
- name: Test
run: npm test

- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.10
rubygems: 3.3.22
- name: Install sass
run: gem install sass
- uses: actions/setup-node@v4
with:
node-version-file: ".tool-versions"
cache: "npm"
- name: Install grunt-cli
run: npm install grunt-cli
- name: Install bower
run: npm install -g bower
- name: Install dependencies
run: npm install
- name: Build
run: script/bootstrap
- name: Test
run: npm test
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.1
2.6.10
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nodejs 6.11.4
ruby 2.3.1
nodejs 16.17.1
ruby 2.6.10
6 changes: 3 additions & 3 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ module.exports = (grunt) ->
'bower_components/underscore/underscore.js'
'bower_components/backbone/backbone.js'
'bower_components/underscore.string/dist/underscore.string.min.js'
'bower_components/beforeunload.js/index.js'
'legacy_packages/beforeunload.js/index.js'
'bower_components/backbone-deep-model/distribution/deep-model.js'
'bower_components/rivets-dobt/dist/rivets.js'
'bower_components/iso-country-names/index.js'
'bower_components/require_once/require_once.js'
'legacy_packages/iso-country-names/index.js'
'legacy_packages/require_once/require_once.js'
'bower_components/domurl/url.min.js',
'bower_components/dompurify/dist/purify.min.js'
]
Expand Down
4 changes: 0 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@
"backbone": "1.1.2",
"underscore": "1.6.0",
"underscore.string": "2.3.3",
"ajb-sanitize": "1.0.1",
"js-cookie": "2.1.3",
"backbone-deep-model": "0.10.4",
"rivets-dobt": "1.0.0",
"iso-country-names": "0.1.0",
"beforeunload.js": "0.3.2",
"store.js": "1.3.16",
"jquery-form": "3.46.0",
"inline_file_upload": "0.0.4",
"require_once": "0.0.1",
"domurl": "2.1.7",
"dompurify": "~1.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion dist/formrenderer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formrenderer.standalone.js

Large diffs are not rendered by default.

Loading