瀏覽代碼

Override version

世界 8 月之前
父節點
當前提交
ff31c469a0
共有 4 個文件被更改,包括 9 次插入5 次删除
  1. 1 1
      clients/android
  2. 1 1
      clients/apple
  3. 4 2
      cmd/internal/update_android_version/main.go
  4. 3 1
      docs/changelog.md

+ 1 - 1
clients/android

@@ -1 +1 @@
-Subproject commit 601e5c1571261691c360d3a017a7aab0551f2b56
+Subproject commit 3a2fc9c8802f0c40f0b1fd2d7acdcabb7aa0855f

+ 1 - 1
clients/apple

@@ -1 +1 @@
-Subproject commit ae8c4ceb6e74fc07780075530747d9eeec1888f1
+Subproject commit 3d5d7343fb473dce772633183791524629493213

+ 4 - 2
cmd/internal/update_android_version/main.go

@@ -46,21 +46,23 @@ func main() {
 		switch propPair[0] {
 		switch propPair[0] {
 		case "VERSION_NAME":
 		case "VERSION_NAME":
 			if propPair[1] != newVersion {
 			if propPair[1] != newVersion {
+				log.Info("updated version from ", propPair[1], " to ", newVersion)
 				versionUpdated = true
 				versionUpdated = true
 				propPair[1] = newVersion
 				propPair[1] = newVersion
-				log.Info("updated version to ", newVersion)
 			}
 			}
 		case "GO_VERSION":
 		case "GO_VERSION":
 			if propPair[1] != runtime.Version() {
 			if propPair[1] != runtime.Version() {
+				log.Info("updated Go version from ", propPair[1], " to ", runtime.Version())
 				goVersionUpdated = true
 				goVersionUpdated = true
 				propPair[1] = runtime.Version()
 				propPair[1] = runtime.Version()
-				log.Info("updated Go version to ", runtime.Version())
 			}
 			}
 		}
 		}
 	}
 	}
 	if !(versionUpdated || goVersionUpdated) {
 	if !(versionUpdated || goVersionUpdated) {
 		log.Info("version not changed")
 		log.Info("version not changed")
 		return
 		return
+	} else if flagRunInCI {
+		log.Fatal("version changed, commit changes first.")
 	}
 	}
 	for _, propPair := range propsList {
 	for _, propPair := range propsList {
 		switch propPair[0] {
 		switch propPair[0] {

+ 3 - 1
docs/changelog.md

@@ -2,10 +2,12 @@
 icon: material/alert-decagram
 icon: material/alert-decagram
 ---
 ---
 
 
-### 1.11.2
+### 1.11.3
 
 
 * Fixes and improvements
 * Fixes and improvements
 
 
+_This version overwrites 1.11.2, as incorrect binaries were released due to a bug in the continuous integration process._
+
 ### 1.11.1
 ### 1.11.1
 
 
 * Fixes and improvements
 * Fixes and improvements