small to build and deployment process

jiriteach · Mar 12, 2021 · c4655f9 · c4655f9
1 parent 627611a
commit c4655f9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/tools/sitegen/run.sh b/tools/sitegen/run.sh
@@ -11,5 +11,5 @@ rm sitegen
 # run the tests in xbarapp.com - we may have
 # just broken them
 cd ../../xbarapp.com
-echo -n "${VERSION}" > .version
+./gen.sh
 go test
diff --git a/xbarapp.com/deploy.sh b/xbarapp.com/deploy.sh
@@ -7,4 +7,5 @@ printf "package main\n\nconst version = \"${VERSION}\"" > version.gen.go
 echo "Deploying xbarapp.com (${VERSION})..."
 
 go test
+npm run build
 gcloud app deploy --project xbarapp --version=beta
diff --git a/xbarapp.com/gen.sh b/xbarapp.com/gen.sh
@@ -0,0 +1,5 @@
+#/bin/bash
+
+set -e
+VERSION=`git describe --tags`
+printf "package main\n\nconst version = \"${VERSION}\"" > version.gen.go
diff --git a/xbarapp.com/public/css/xbar.css b/xbarapp.com/public/css/xbar.css
diff --git a/xbarapp.com/templates/_layout.html b/xbarapp.com/templates/_layout.html
@@ -73,15 +73,15 @@
 		</div>
 		{{ template "body" . }}
 		<footer class='container mx-auto text-white text-lg opacity-75 mt-8'>
-			<div class='text-center p-16'>
+			<div class='text-center p-16 pb-24'>
 				<p>
 					<div>
-						<a target='github' class='underline hover:text-white' href='https://github.com/matryer/xbar'>GitHub project</a>
+						<a target='github' class='hover:underline hover:text-white' href='https://github.com/matryer/xbar'>GitHub project</a>
 						•
-						<a target='github' class='underline hover:text-white' href='https://github.com/matryer/xbar#writing-plugins'>Writing plugins guide</a>
+						<a target='github' class='hover:underline hover:text-white' href='https://github.com/matryer/xbar#writing-plugins'>Writing plugins guide</a>
 					</div>
 					<div class='mt-8'>
-						<a target='github' href='https://github.com/matryer/xbar/blob/master/LICENSE.txt'>MIT License</a> • <a target='twitter' class='underline hover:text-white' href='https://twitter.com/matryer'>@matryer</a>
+						<a target='github' class='hover:underline' href='https://github.com/matryer/xbar/blob/master/LICENSE.txt'>MIT License</a> • <a target='twitter' class='hover:underline hover:text-white' href='https://twitter.com/matryer'>@matryer</a>
 					</div>
 					<div class='opacity-50 mt-2 text-sm mt-8'>
 						Updated {{ .LastUpdatedFormatted }} - <code>{{ .Version }}</code>

diff --git a/xbarapp.com/version.gen.go b/xbarapp.com/version.gen.go
@@ -1,3 +1,3 @@
 package main
 
-const version = "v2.0.25-beta-10-gf9b5dbe6"
+const version = "v2.0.25-beta-11-g627611a3"