Ubuntu Groovy -> Impish

mongoose-os · Oct 22, 2021 · 917564f · 917564f
1 parent 63292ed
commit 917564f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/tools/deploy_mos.py b/tools/deploy_mos.py
@@ -37,7 +37,7 @@
 GPG_KEY_PATH = os.path.join(os.environ["HOME"], ".gnupg-cesantabot")
 BUILD_DEB_PATH = os.path.join("tools", "ubuntu", "build-deb.sh")
 UPLOAD_DEB_PATH = os.path.join("tools", "ubuntu", "upload-deb.sh")
-UBUNTU_VERSIONS = ["xenial", "bionic", "focal", "groovy", "hirsute"]
+UBUNTU_VERSIONS = ["xenial", "bionic", "focal", "hirsute", "impish"]
 
 deb_package = "mos-latest"
 tag_effective = "latest"

diff --git a/tools/docker/golang/Makefile b/tools/docker/golang/Makefile
@@ -1,6 +1,6 @@
 all: build-all
 
-UBUNTU_DISTRS := xenial bionic focal groovy hirsute
+UBUNTU_DISTRS := xenial bionic focal hirsute impish
 
 build-all: $(foreach u,$(UBUNTU_DISTRS),docker-build-ubuntu-golang-$(u)) docker-build-ubuntu32-golang-bionic docker-build-golang-mingw
 

diff --git a/tools/ubuntu/mos-groovy.recipe → tools/ubuntu/mos-impish.recipe b/tools/ubuntu/mos-groovy.recipe → tools/ubuntu/mos-impish.recipe
@@ -1,4 +1,4 @@
-# git-build-recipe format 0.4 deb-version {latest-tag}+{git-commit}~groovy0
+# git-build-recipe format 0.4 deb-version {latest-tag}+{git-commit}~impish0
 
 # Build from local repo (volume-mount a clone of https://github.com/mongoose-os/mos.git to /src):
 /src 1.11_CHANGE_ME

diff --git a/tools/ubuntu/mos-latest-groovy.recipe → tools/ubuntu/mos-latest-impish.recipe b/tools/ubuntu/mos-latest-groovy.recipe → tools/ubuntu/mos-latest-impish.recipe
@@ -1,4 +1,4 @@
-# git-build-recipe format 0.4 deb-version {revtime}+{git-commit}~groovy0
+# git-build-recipe format 0.4 deb-version {revtime}+{git-commit}~impish0
 
 # Build from local repo (volume-mount a clone of https://github.com/mongoose-os/mos.git to /src):
 /src master

diff --git a/version/version_util.go b/version/version_util.go
@@ -44,7 +44,7 @@ var (
 	regexpVersionNumber = regexp.MustCompile(`^\d+\.[0-9.]*$`)
 	regexpBuildIdDistr  = regexp.MustCompile(`^(?P<version>[^+]+)\+(?P<hash>[^~]+)\~(?P<distr>[^\d]+)\d+$`)
 
-	ubuntuDistrNames = []string{"xenial", "bionic", "focal", "groovy", "hirsute"}
+	ubuntuDistrNames = []string{"xenial", "bionic", "focal", "hirsute", "impish"}
 )
 
 // GetMosVersion returns this binary's version, or "latest" if it's not a release build.