Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cb340a7a78 | |||
| c0fa7c40a6 | |||
| 05a6b48901 | |||
| 8dfdaedafb | |||
| 12363fe362 | |||
| 3daeb789e1 | |||
| 02e0bd4aa2 | |||
| 78dd79f792 |
@@ -2,8 +2,8 @@ pipeline {
|
|||||||
agent any
|
agent any
|
||||||
|
|
||||||
tools {
|
tools {
|
||||||
maven 'Maven-3.5.0'
|
maven 'Maven-3.6.0'
|
||||||
jdk 'OpenJdk-11.0.2'
|
jdk 'OpenJdk-11.0.4'
|
||||||
}
|
}
|
||||||
|
|
||||||
environment {
|
environment {
|
||||||
@@ -14,7 +14,7 @@ pipeline {
|
|||||||
stage('Configuration') {
|
stage('Configuration') {
|
||||||
steps {
|
steps {
|
||||||
dir('codiki-properties') {
|
dir('codiki-properties') {
|
||||||
git url:'https://gogs.takiguchi.ovh/florian/codiki-properties.git', branch: 'master', credentialsId: 'a6494064-8130-42fd-9d3d-e7734518c79e'
|
git url:'https://gitea.takiguchi.ovh/Codiki/codiki-properties.git', branch: 'master', credentialsId: 'Jenkins-gitea'
|
||||||
}
|
}
|
||||||
script {
|
script {
|
||||||
sh 'cp ./codiki-properties/application-prod.yml ./src/main/resources/application.yml'
|
sh 'cp ./codiki-properties/application-prod.yml ./src/main/resources/application.yml'
|
||||||
@@ -88,9 +88,9 @@ pipeline {
|
|||||||
cleanRemote: false,
|
cleanRemote: false,
|
||||||
excludes: '',
|
excludes: '',
|
||||||
execCommand: """
|
execCommand: """
|
||||||
mv /opt/codiki-2/codiki.jar /opt/codiki-2/bin/codiki.jar
|
mv /home/codiki/codiki.jar /opt/codiki/bin/codiki.jar
|
||||||
sudo /opt/codiki-2/bin/codiki-jenkins.sh
|
chmod 700 /opt/codiki/bin/codiki.jar
|
||||||
sudo service codiki-2 restart
|
sudo service codiki restart
|
||||||
""",
|
""",
|
||||||
execTimeout: 120000,
|
execTimeout: 120000,
|
||||||
flatten: false,
|
flatten: false,
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>org.codiki</groupId>
|
<groupId>org.codiki</groupId>
|
||||||
<artifactId>codiki</artifactId>
|
<artifactId>codiki</artifactId>
|
||||||
<version>1.2.0</version>
|
<version>1.2.2</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>codiki</name>
|
<name>codiki</name>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
app:
|
app:
|
||||||
name: Codiki
|
name: Codiki
|
||||||
description: A wiki application.
|
description: A wiki application.
|
||||||
version: 1.2.0
|
version: 1.2.2
|
||||||
platform: develop
|
platform: develop
|
||||||
|
|
||||||
codiki:
|
codiki:
|
||||||
|
|||||||
5
src/main/sql/update_1.2.1.sql
Executable file
5
src/main/sql/update_1.2.1.sql
Executable file
@@ -0,0 +1,5 @@
|
|||||||
|
INSERT INTO version (number) VALUES ('1.2.1');
|
||||||
|
|
||||||
|
INSERT INTO version_revision (version_id, text, bugfix) VALUES
|
||||||
|
(5, 'Nettoyage de code.', TRUE),
|
||||||
|
(5, 'Modifications visuelles, notamment sur l''image de l''entête du site et le menu principal.', FALSE);
|
||||||
12
src/main/sql/update_1.2.2.sql
Normal file
12
src/main/sql/update_1.2.2.sql
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
INSERT INTO category (name, creator_id) VALUES
|
||||||
|
('Windows', 1),
|
||||||
|
('Outillage', 1);
|
||||||
|
|
||||||
|
INSERT INTO sub_category VALUES
|
||||||
|
(12, 2),
|
||||||
|
(13, 4);
|
||||||
|
|
||||||
|
INSERT INTO version (number) VALUES ('1.2.2');
|
||||||
|
|
||||||
|
INSERT INTO version_revision (version_id, text, bugfix) VALUES
|
||||||
|
(6, 'Ajout des catégories "Windows" et "Outillage".', FALSE);
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
production: false,
|
production: false,
|
||||||
appVersion: '1.2.0',
|
appVersion: '1.2.2',
|
||||||
title: 'Intégration'
|
title: 'Intégration'
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
production: true,
|
production: true,
|
||||||
appVersion: '1.2.0',
|
appVersion: '1.2.2',
|
||||||
title: ''
|
title: ''
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
export const environment = {
|
export const environment = {
|
||||||
production: false,
|
production: false,
|
||||||
appVersion: '1.2.0',
|
appVersion: '1.2.2',
|
||||||
title: 'Développement'
|
title: 'Développement'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user