8 Commits

8 changed files with 28 additions and 11 deletions

View File

@@ -2,8 +2,8 @@ pipeline {
agent any
tools {
maven 'Maven-3.5.0'
jdk 'OpenJdk-11.0.2'
maven 'Maven-3.6.0'
jdk 'OpenJdk-11.0.4'
}
environment {
@@ -14,7 +14,7 @@ pipeline {
stage('Configuration') {
steps {
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 {
sh 'cp ./codiki-properties/application-prod.yml ./src/main/resources/application.yml'
@@ -88,9 +88,9 @@ pipeline {
cleanRemote: false,
excludes: '',
execCommand: """
mv /opt/codiki-2/codiki.jar /opt/codiki-2/bin/codiki.jar
sudo /opt/codiki-2/bin/codiki-jenkins.sh
sudo service codiki-2 restart
mv /home/codiki/codiki.jar /opt/codiki/bin/codiki.jar
chmod 700 /opt/codiki/bin/codiki.jar
sudo service codiki restart
""",
execTimeout: 120000,
flatten: false,

View File

@@ -5,7 +5,7 @@
<groupId>org.codiki</groupId>
<artifactId>codiki</artifactId>
<version>1.2.0</version>
<version>1.2.2</version>
<packaging>jar</packaging>
<name>codiki</name>

View File

@@ -1,7 +1,7 @@
app:
name: Codiki
description: A wiki application.
version: 1.2.0
version: 1.2.2
platform: develop
codiki:

5
src/main/sql/update_1.2.1.sql Executable file
View 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);

View 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);

View File

@@ -1,5 +1,5 @@
export const environment = {
production: false,
appVersion: '1.2.0',
appVersion: '1.2.2',
title: 'Intégration'
};

View File

@@ -1,5 +1,5 @@
export const environment = {
production: true,
appVersion: '1.2.0',
appVersion: '1.2.2',
title: ''
};

View File

@@ -4,7 +4,7 @@
export const environment = {
production: false,
appVersion: '1.2.0',
appVersion: '1.2.2',
title: 'Développement'
};