CI git tag version

Author: hulotavrus

.github/workflows/deploy.yml

@@ -8,6 +8,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     environment: production
+    env:
+      APP_VERSION: ${{ github.event.release.tag_name }}
 
     steps:
       - name: Checkout repository
@@ -33,13 +35,15 @@ jobs:
           echo "tomcat.url=${{ secrets.SERVER_URL }}" >> $GITHUB_ENV
           echo "tomcat.user=${{ secrets.TOMCAT_USERNAME }}" >> $GITHUB_ENV
           echo "tomcat.password=${{ secrets.TOMCAT_PASSWORD }}" >> $GITHUB_ENV
+          echo "app.version=${APP_VERSION}" > src/main/resources/version.properties
 
       - name: Deploy to Tomcat
         run: mvn tomcat7:deploy -DskipTests
         env:
+          APP_VERSION: ${{ env.APP_VERSION }}
           SERVER_URL: ${{ secrets.SERVER_URL }}
           TOMCAT_USERNAME: ${{ secrets.TOMCAT_USERNAME }}
           TOMCAT_PASSWORD: ${{ secrets.TOMCAT_PASSWORD }}
           BOT_DB_URL: ${{ secrets.BOT_DB_URL }}
           BOT_DB_USER: ${{ secrets.BOT_DB_USER }}
-          BOT_DB_PASS: ${{ secrets.BOT_DB_PASS }}
+          BOT_DB_PASS: ${{ secrets.BOT_DB_PASS }}

src/main/java/ru/flashcards/telegram/Application.java

@@ -4,12 +4,14 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import ru.flashcards.telegram.bot.config.TelegramProperties;
 
 @SpringBootApplication
 @EnableScheduling
 @EnableConfigurationProperties(TelegramProperties.class)
+@PropertySource("classpath:version.properties")
 public class Application extends SpringBootServletInitializer {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

src/main/java/ru/flashcards/telegram/bot/controller/WebhookController.java

@@ -5,6 +5,7 @@
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +34,7 @@ public class WebhookController {
     private MessageFactoryProvider messageFactoryProvider;
     private CallbackFactoryProvider callbackFactoryProvider;
     private UserModeSettings userModeSettings;
+    private Environment environment;
 
     @PostMapping("/webhook")
     public void onUpdateReceived(@RequestBody Update update) {
@@ -46,9 +48,9 @@ public void onUpdateReceived(@RequestBody Update update) {
             logger.error("Internal error", e);
         }
     }
-    @GetMapping("/test")
-    public ResponseEntity<String> test() {
-        return ResponseEntity.status(HttpStatus.OK).body("1.3.4");
+    @GetMapping("/version")
+    public ResponseEntity<String> version() {
+        return ResponseEntity.status(HttpStatus.OK).body(environment.getProperty("app.version", "unknown"));
     }
 
     private List<BotApiMethod<?>> handleMessageInput(Message message) {
@@ -98,4 +100,4 @@ private void execute(List<BotApiMethod<?>> response) {
             }
         });
     }
-}
+}

src/main/resources/version.properties

@@ -0,0 +1 @@
+app.version=local