Build script improvements

bin/aws-eb-docker/release-eb-version.sh

@@ -27,8 +27,14 @@ fi
 # TODO: improve this (hard coding)
 EB_FILE=/tmp/${MB_TAG}.zip
 EB_LAUNCH_FILE=launch-aws-eb.html
-S3_FILE=s3://${S3_BUCKET}/enterprise/${MB_TAG}/metabase-aws-eb.zip
-S3_LAUNCH_FILE=s3://${S3_BUCKET}/enterprise/${MB_TAG}/${EB_LAUNCH_FILE}
+
+if [ "$MB_EDITION" = "ENTERPRISE" ]; then
+    S3_FILE=s3://${S3_BUCKET}/enterprise/${MB_TAG}/metabase-aws-eb.zip
+    S3_LAUNCH_FILE=s3://${S3_BUCKET}/enterprise/${MB_TAG}/${EB_LAUNCH_FILE}
+else
+    S3_FILE=s3://${S3_BUCKET}/${MB_TAG}/metabase-aws-eb.zip
+    S3_LAUNCH_FILE=s3://${S3_BUCKET}/${MB_TAG}/${EB_LAUNCH_FILE}
+fi
 
 # make the release file
 ${BASEDIR}/build-eb-version.sh ${MB_TAG} ${DOCKERHUB_REPO}

bin/release/release/common.clj

@@ -102,10 +102,10 @@
     :ce "metabase/metabase-buildpack"
     nil))
 
-(defn metabase-repo []
-  (case (edition)
-    :ce "metabase/metabase"
-    :ee "metabase/metabase-enterprise"))
+(defn metabase-repo
+  "Metabase GitHub repo"
+  []
+  "metabase/metabase")
 
 (defn docker-tag []
   (format "%s:v%s" (docker-image-name) (version)))

bin/release/release/heroku.clj

 (ns release.heroku
   "Code related to updating the Heroku build pack."
   (:require [metabuild-common.core :as u]
-            [release.common :as c]))
+            [release.common :as c]
+            [release.common.git :as git]))
 
 (def ^:private heroku-repo "metabase/metabase-buildpack")
 
@@ -35,11 +36,8 @@
           (spit version-file (str (c/version) "\n"))
           (when-not (zero? (:exit (u/sh* {:dir dir} "git" "commit" "-am" (format "v%s" (c/version)))))
             (u/announce "Nothing to update")))
-        (u/step "Delete old tags"
-          (try
-            (u/sh {:dir dir} "git" "push" "--delete" "origin" (c/version))
-            (catch Throwable _
-              (u/announce "Nothing to delete."))))
+        (git/delete-local-tag! dir (c/version))
+        (git/delete-remote-tag! dir (c/version))
         (u/step "Push updated tag"
           (u/sh {:dir dir} "git" "tag" (c/version))
           (u/sh {:dir dir} "git" "push")

resources/locales.clj

 {
-  :locales  #{"en" "nl" "zh" "zh-HK" "fr" "ja" "de" "es" "ca" "pl" "zh-TW" "it" "ru" "fa" "sk" "pt" "tr" }
+  :locales  #{"en" "nl" "zh" "zh-HK" "fr" "ja" "bg" "de" "nb" "es" "cs" "ca" "pl" "zh-TW" "vi" "it" "ru" "sv" "fa" "sk" "pt" "tr" }
   :packages ["metabase"]
   :bundle   "metabase.Messages"
 }