Просмотр исходного кода

Revert "Updated version"

This reverts commit 80016542cfcee856e6db0513b650d76df70ca71b.
alex.kopachov 2 лет назад
Родитель
Сommit
10aadf3e8e
3 измененных файлов с 11 добавлено и 8 удалено
  1. 7 4
      .github/workflows/create-new-release.yml
  2. 1 1
      totp/application.fam
  3. 3 3
      totp/version.h

+ 7 - 4
.github/workflows/create-new-release.yml

@@ -21,10 +21,13 @@ jobs:
           if [[ "${{ inputs.new_version }}" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; 
           then 
             echo "New version looks okay";
-            sed -r -i 's/TOTP_APP_VERSION_MAJOR\s+\([0-9]+\)/TOTP_APP_VERSION_MAJOR (${BASH_REMATCH[1]})/g' totp/version.h
-            sed -r -i 's/TOTP_APP_VERSION_MINOR\s+\([0-9]+\)/TOTP_APP_VERSION_MINOR (${BASH_REMATCH[2]})/g' totp/version.h
-            sed -r -i 's/TOTP_APP_VERSION_PATCH\s+\([0-9]+\)/TOTP_APP_VERSION_PATCH (${BASH_REMATCH[3]})/g' totp/version.h
-            sed -r -i 's/fap_version="[0-9]+\.[0-9]+"/fap_version="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}${BASH_REMATCH[3]}"/g' totp/application.fam
+            MAJOR="${BASH_REMATCH[1]}"
+            MINOR="${BASH_REMATCH[2]}"
+            PATCH="${BASH_REMATCH[3]}"
+            sed -r -i "s/TOTP_APP_VERSION_MAJOR\s+\([0-9]+\)/TOTP_APP_VERSION_MAJOR ($MAJOR)/g" totp/version.h
+            sed -r -i "s/TOTP_APP_VERSION_MINOR\s+\([0-9]+\)/TOTP_APP_VERSION_MINOR ($MINOR)/g" totp/version.h
+            sed -r -i "s/TOTP_APP_VERSION_PATCH\s+\([0-9]+\)/TOTP_APP_VERSION_PATCH ($PATCH)/g" totp/version.h
+            sed -r -i "s/fap_version="[0-9]+\.[0-9]+\"/fap_version="$MAJOR.$MINOR$PATCH\"/g" totp/application.fam
           else 
             echo "Invalid version format";
             exit 1

+ 1 - 1
totp/application.fam

@@ -15,7 +15,7 @@ App(
     ],
     stack_size=2 * 1024,
     order=20,
-    fap_version="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}${BASH_REMATCH[3]}",
+    fap_version="3.20",
     fap_author="Alexander Kopachov (@akopachov)",
     fap_description="Software-based TOTP authenticator for Flipper Zero device",
     fap_weburl="https://github.com/akopachov/flipper-zero_authenticator",

+ 3 - 3
totp/version.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#define TOTP_APP_VERSION_MAJOR (${BASH_REMATCH[1]})
-#define TOTP_APP_VERSION_MINOR (${BASH_REMATCH[2]})
-#define TOTP_APP_VERSION_PATCH (${BASH_REMATCH[3]})
+#define TOTP_APP_VERSION_MAJOR (3)
+#define TOTP_APP_VERSION_MINOR (2)
+#define TOTP_APP_VERSION_PATCH (0)