diff --git a/.drone.yml b/.drone.yml index bd467c6..04aad1f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,20 @@ steps: - name: m2 path: /root/.m2 + - name: archive-artifact + image: alpine:latest + commands: + - mkdir -p /web/mplayer4anime + - echo Download location - https://redrise.ru/builds/`ls mplayer*` + - cp mplayer4anime-.*jar /ArtifactsLocalStorage/mplayer4anime + volumes: + - name: ArtifactsLocalStorage + path: /ArtifactsLocalStorage + volumes: - name: m2 host: - path: /m2 \ No newline at end of file + path: /m2 + - name: ArtifactsLocalStorage + host: + path: /builds \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index ca2080a..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,31 +0,0 @@ -pipeline { - agent { - docker { - image 'maven:3-jdk-11' - args '-v /home/docker/jenkins/files/m2:/root/.m2' - } - } - - stages { - stage('Build') { - steps { - sh 'mvn -B -DskipTests clean package' - } - } - stage('Test') { - steps { - echo 'Skip testing...' - } - } - stage('Deploy') { - steps { - echo 'Skip deployment...' - } - } - } - post { - always { - archiveArtifacts artifacts: 'target/*-jar-with-dependencies.jar', onlyIfSuccessful: true - } - } -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index bb4d038..b3357bd 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ UTF-8 + yyyyMMdd.HHmmss @@ -152,6 +153,8 @@ + ${project.artifactId}-${project.version}-${maven.build.timestamp} + org.apache.maven.plugins @@ -187,6 +190,7 @@ jar-with-dependencies + false @@ -199,6 +203,12 @@ + + + src/main/resources + true + + \ No newline at end of file diff --git a/src/main/resources/locale.properties b/src/main/resources/locale.properties index 7537564..a7dc325 100644 --- a/src/main/resources/locale.properties +++ b/src/main/resources/locale.properties @@ -1,5 +1,5 @@ about_line1=mplayer4amine distributes under GNU GPLv3 license. -about_line2=Release: v0.15 +about_line2=Release: v${project.version} about_line3=Development & maintenance by Dmitry Isaenko. about_AboutName=About main_tab_audio=Audio diff --git a/src/main/resources/locale_rus.properties b/src/main/resources/locale_rus.properties index e7df953..9e3db43 100644 --- a/src/main/resources/locale_rus.properties +++ b/src/main/resources/locale_rus.properties @@ -1,6 +1,5 @@ menu_File_Recent=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 \u0444\u0430\u0439\u043B\u044B... about_line1=mplayer4amine \u0440\u0430\u0441\u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u044F\u0435\u0442\u0441\u044F \u043F\u043E \u043B\u0438\u0446\u0435\u043D\u0437\u0438\u0438 GNU GPLv3. -about_line2=\u0420\u0435\u043B\u0438\u0437: v0.15 about_line3=\u0420\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u043E \u0438 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F \u0414\u043C\u0438\u0442\u0440\u0438\u0435\u043C \u0418\u0441\u0430\u0435\u043D\u043A\u043E. about_AboutName=\u041E \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0438 main_tab_audio=\u0410\u0443\u0434\u0438\u043E @@ -54,4 +53,5 @@ settings_videoExtensionList=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u04 settings_audioExtensionList=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0434\u043B\u044F \u0430\u0443\u0434\u0438\u043E\u0434\u043E\u0440\u043E\u0436\u0435\u043A: ApplyBtn=\u041F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C settings_backendSelect=\u0414\u0432\u0438\u0436\u043E\u043A \u0432\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u0435\u0434\u0435\u043D\u0438\u044F: +about_line2=\u0420\u0435\u043B\u0438\u0437: v${project.version}