浏览代码

Fix debug build workflow

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 年之前
父节点
当前提交
4266b0138a
共有 2 个文件被更改,包括 7 次插入6 次删除
  1. 1 1
      .github/workflows/build-and-publish-debug.yml
  2. 6 5
      dockerfiles/buildall.sh

+ 1 - 1
.github/workflows/build-and-publish-debug.yml

@@ -1,4 +1,4 @@
-name: Build and publish
+name: Build and publish debug
 # This workflow is triggered on new tags of Community Edition 7.8.x or later,
 # or any of the weekly tag names starting 'master'
 on:

+ 6 - 5
dockerfiles/buildall.sh

@@ -18,11 +18,6 @@ if [[ -n ${INPUT_USERNAME} ]] ; then
   PUSH=1
 fi
 
-if [[ -n ${INPUT_BUILDTYPE} ]] ; then
-  buildtype="--build-arg BUILD_TYPE=$INPUT_BUILDTYPE"
-  suffix=-$INPUT_BUILDTYPE
-fi
-
 if [[ -z ${BUILD_VER} ]] ; then
   echo Current tag could not be located
   echo Perhaps you meant to run incr.sh ?
@@ -51,6 +46,12 @@ build_image() {
 }
 
 build_image platform-build-base ${BASE_VER}
+
+if [[ -n ${INPUT_BUILDTYPE} ]] ; then
+  buildtype="--build-arg BUILD_TYPE=$INPUT_BUILDTYPE"
+  suffix=-$INPUT_BUILDTYPE
+fi
+
 build_image platform-build ${BUILD_VER} ${BASE_VER}
 build_image platform-core ${BUILD_VER}
 build_image roxie ${BUILD_VER}