Skip to content
Snippets Groups Projects
Commit b5ff9af3 authored by Valentin Groues's avatar Valentin Groues :eyes:
Browse files

Merge branch 'fix/npm' into 'master'

updated package.json and package-lock.json

See merge request !455
parents c0b8f933 d5be32ce
No related branches found
No related tags found
1 merge request!455updated package.json and package-lock.json
Pipeline #90141 passed
......@@ -97,12 +97,12 @@ test_create_dummy_script:
- python db_scripts/create_dummy_data.py
test_docker_compose:
image: docker:19.03.0
image: docker:20
stage: test
only:
- tags
services:
- name: docker:19.03.0-dind
- name: docker:20-dind
command: ["--mtu=1458", "--registry-mirror", "https://docker-registry.lcsb.uni.lu"]
tags:
- privileged
......@@ -186,11 +186,7 @@ test_install_debian_package_debian_bookworm:
- apt-get update
- DEBIAN_FRONTEND=noninteractive apt-get install -y ssh software-properties-common dirmngr wget curl
- debian_file=$(ls *.deb)
- echo "PUT $debian_file /docker/incoming" | sftp -o StrictHostKeyChecking=no user@debian-repo
- ssh root@debian-repo /usr/local/sbin/reprepro-import
- apt-add-repository "deb http://debian-repo/ unstable main"
- apt-get update --allow-insecure-repositories
- DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated smasch
- DEBIAN_FRONTEND=noninteractive apt install -y ./$debian_file
#systemd is not available on docker so we need to start manually gunicorn (smasch.service is not tested)
- cd /usr/lib/smasch/
- /usr/lib/smasch/env/bin/gunicorn -b 127.0.0.1:8888 --pid smasch.pid smash.wsgi --error-logfile /var/log/smasch/gunicorn.log --log-level DEBUG --capture-output --limit-request-line 8192 &
......
smasch (1.4.2-1) stable; urgency=medium
* dependencies: updated package.json and package-lock.json
* bug fix: issue with npm packages versions (#533)
* docker: upgraded dind version docker-compose test in gitlab ci
* bug fix: issue with datatables js wrong version installed (#533)
-- Carlos Vega <carlos.vega@lih.lu> Tue, 9 Apr 2024 11:48:00 +0200
......
......@@ -10,6 +10,7 @@ mkdir debian
mkdir debian/smash
cp -r smash/web debian/smash/web
cp -r smash/package.json debian/smash/
cp -r smash/package-lock.json debian/smash/
cp -r smash/smash debian/smash/smash
cp -r smash/db_scripts debian/smash/db_scripts
cp smash/manage.py debian/smash/manage.py
......
......@@ -30,6 +30,7 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{_exec_prefix}/lib/%{name}
cp -r smash/web %{buildroot}%{_exec_prefix}/lib/%{name}/web
cp -r smash/package.json %{buildroot}%{_exec_prefix}/lib/%{name}
cp -r smash/package-lock.json %{buildroot}%{_exec_prefix}/lib/%{name}
cp -r smash/smash %{buildroot}%{_exec_prefix}/lib/%{name}/smash
cp -r smash/db_scripts %{buildroot}%{_exec_prefix}/lib/%{name}/db_scripts
cp smash/manage.py %{buildroot}%{_exec_prefix}/lib/%{name}/manage.py
......
This diff is collapsed.
{
"name": "smasch",
"version": "1.0.0",
"version": "1.4.2",
"description": "",
"main": "index.js",
"dependencies": {
"awesomplete": "^1.1.5",
"admin-lte": "^2.3.7",
"bootstrap-datepicker": "^1.7.0",
"bootstrap": "^3.3.6",
"cookieconsent": "^3.1.1",
"datatables.net-bs": "^1.13.6",
"datatables.net": "^1.13.6",
"datatables.net-buttons": "^2.4.2",
"datatables.net-buttons-bs": "^2.4.2",
"eonasdan-bootstrap-datetimepicker": "^4.17.49",
"font-awesome": "^4.7.0",
"fullcalendar": "^3.4.0",
"fullcalendar-scheduler": "^1.6.2",
"icheck": "^1.0.2",
"html2canvas": "^0.5.0-beta3",
"ionicons": "^2.0.1",
"jquery": "^2.2.4",
"jquery-ui-dist": "^1.12.1",
"jspdf": "^1.3.2",
"jszip": "^3.5.0",
"moment": "^2.29.4",
"moment-range": "^3.1.1",
"pdfmake": "^0.2.9"
},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "AGPLv3",
"dependencies": {
"admin-lte": "2.3.7",
"awesomplete": "1.1.5",
"bootstrap": "3.3.6",
"bootstrap-datepicker": "1.7.0",
"cookieconsent": "3.1.1",
"datatables.net-bs": "1.13.6",
"datatables.net-buttons": "2.4.2",
"datatables.net-buttons-bs": "2.4.2",
"eonasdan-bootstrap-datetimepicker": "4.17.49",
"font-awesome": "4.7.0",
"fullcalendar": "3.4.0",
"fullcalendar-scheduler": "1.6.2",
"html2canvas": "0.5.0-beta3",
"icheck": "1.0.2",
"ionicons": "2.0.1",
"jquery": "2.2.4",
"jquery-ui-dist": "1.12.1",
"jspdf": "1.3.2",
"jszip": "3.5.0",
"moment": "2.29.4",
"moment-range": "3.1.1",
"pdfmake": "0.2.9"
}
"license": "AGPL-3.0-only"
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment