[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: Better Travis tag handling (4071c2d)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/4071c2dddac7f344d849550ce876d7adce89399b

>---------------------------------------------------------------

commit 4071c2dddac7f344d849550ce876d7adce89399b
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Wed Aug 28 15:46:18 2019 +0200

    Better Travis tag handling


>---------------------------------------------------------------

4071c2dddac7f344d849550ce876d7adce89399b
 .travis.yml |  2 +-
 build.lua   | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 52ede16..7d53e62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ cache:
 
 
 script: 
-  - l3build ctan -H --show-log-on-error
+  - l3build install && l3build ctan -H --show-log-on-error
 
 deploy:
   - provider: releases
diff --git a/build.lua b/build.lua
index ec7fc15..321a6ba 100644
--- a/build.lua
+++ b/build.lua
@@ -2,7 +2,7 @@
 packageversion= "3.002-dev"
 packagedate   = "2019-08-11"
 packagedesc   = "ignorable"
-checkformat   = "latex" -- for travis until something better comes up
+checkformat   = "latex"
 
 module   = "luaotfload"
 ctanpkg  = "luaotfload"
@@ -20,13 +20,18 @@ print(mydata.email)
 --------- setup things for a dev-version
 -- See stackoverflow.com/a/12142066/212001 / build-config from latex2e
 local master_branch do
-  local branch = os.getenv'TRAVIS_BRANCH'
-  if not branch then
-    local f = io.popen'git rev-parse --abbrev-ref HEAD'
-    branch = f:read'*a':sub(1,-2)
-    assert(f:close())
+  local tag = os.getenv'TRAVIS_TAG'
+  if tag then
+    master_branch = not string.match(tag, '-dev$')
+  else
+    local branch = os.getenv'TRAVIS_BRANCH'
+    if not branch then
+      local f = io.popen'git rev-parse --abbrev-ref HEAD'
+      branch = f:read'*a':sub(1,-2)
+      assert(f:close())
+    end
+    master_branch = string.match(branch, '^master')
   end
-  master_branch = string.match(branch, '^master')
   if not master_branch then
     tdsroot = "latex-dev"
     print("creating/installing dev-version in " .. tdsroot)