Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build-and-upload:
runs-on: ubuntu-latest
env:
NODE_VERSION: 10.24.1
NODE_VERSION: 20
CHROME_BIN: google-chrome
editorType: contentEditor
framework_version_number: ${{ github.ref_name }}
Expand Down
22 changes: 5 additions & 17 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,10 @@ jobs:
path: content-editor
fetch-depth: 0

- name: Setup Node.js 10.14.1
- name: Setup Node.js 20
uses: actions/setup-node@v4
with:
node-version: '10.14.1'

- name: Install Python 2
run: |
sudo apt-get update
sudo apt-get install -y python2
sudo ln -sf /usr/bin/python2 /usr/bin/python

- name: Set npm python config
run: npm config set python /usr/bin/python2
node-version: '20'

- name: Cache dependencies
uses: actions/cache@v3
Expand All @@ -58,10 +49,7 @@ jobs:

- name: Install npm dependencies
working-directory: content-editor
env:
PYTHON: $(which python)
NODE_GYP_FORCE_PYTHON: $(which python)
run: npm install --no-optional
run: npm install --no-optional --legacy-peer-deps

- name: Prune bower dependencies
working-directory: content-editor/app
Expand Down Expand Up @@ -94,10 +82,10 @@ jobs:
mkdir -p /tmp/coverage
cp coverage/lcov/HeadlessChrome\ 71.0.3578\ \(Linux\ 0.0.0\)/lcov.info /tmp/coverage/ || true

- name: Setup Node.js 14 for SonarQube
- name: Setup Node.js 20 for SonarQube
uses: actions/setup-node@v4
with:
node-version: '14'
node-version: '20'

- name: Install SonarQube scanner
run: npm install -g sonarqube-scanner
Expand Down
22 changes: 1 addition & 21 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,26 +87,7 @@ module.exports = function(grunt) {
}
},

aws_s3: {
options: {
accessKeyId: '', // Use the variables
secretAccessKey: '', // You can also use env variables
region: 'ap-south-1',
uploadConcurrency: 5, // 5 simultaneous uploads
downloadConcurrency: 5 // 5 simultaneous downloads
},
main: {
options: {
bucket: 'ekstep-public-dev',
differential: true, // Only uploads the files that have changed
gzipRename: 'ext' // when uploading a gz file, keep the original extension
},
files: [
{ dest: 'v3/preview/', cwd: 'app/preview/', action: 'download' }
]
}
},
// this is only used for deployment
// this is only used for deployment
compress: {
main: {
options: {
Expand Down Expand Up @@ -144,7 +125,6 @@ module.exports = function(grunt) {

grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-aws-s3');
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-contrib-rename');
grunt.loadNpmTasks('grunt-jsdoc');
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/coreplugins.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading