Commit f9c56683 authored by Heinz N. Gies's avatar Heinz N. Gies

merge

parents 2886512a 8bff6ec7
Pipeline #12946876 (#) passed with stage
in 1 minute and 21 seconds
...@@ -45,7 +45,7 @@ smartos: ...@@ -45,7 +45,7 @@ smartos:
<<: *not_triggered <<: *not_triggered
stage: package stage: package
script: script:
- export SUFFIX=$(/opt/local/bin/erl -noshell -eval '{{Y, MM, D}, {H, M, S}} = calendar:universal_time(), io:format("pre~4.10.0B~2.10.0B~2.10.0B~2.10.0B~2.10.0B~2.10.0B", [Y, MM, D, H, M, S]),init:stop()'); - export SUFFIX=$(if [ "$CI_BUILD_REF_NAME" = "master" ]; then echo ""; else /opt/local/bin/erl -noshell -eval '{{Y, MM, D}, {H, M, S}} = calendar:universal_time(), io:format("pre~4.10.0B~2.10.0B~2.10.0B~2.10.0B~2.10.0B~2.10.0B", [Y, MM, D, H, M, S]),init:stop()'; fi);
- export DS_VER=$(echo $CI_RUNNER_TAGS | sed 's/.*base64-\([0-9.]*\).*/\1/') - export DS_VER=$(echo $CI_RUNNER_TAGS | sed 's/.*base64-\([0-9.]*\).*/\1/')
- export BRANCH=$(if [ "$CI_BUILD_REF_NAME" = "master" ]; then echo rel; else echo dev; fi) - export BRANCH=$(if [ "$CI_BUILD_REF_NAME" = "master" ]; then echo rel; else echo dev; fi)
- gmake dist - gmake dist
...@@ -61,6 +61,7 @@ smartos: ...@@ -61,6 +61,7 @@ smartos:
refs: refs:
- master - master
- dev - dev
- /^dev-.*$/
smartos_test: smartos_test:
stage: test stage: test
...@@ -75,6 +76,7 @@ smartos_test: ...@@ -75,6 +76,7 @@ smartos_test:
- pipelines - pipelines
- master - master
- dev - dev
- /^dev-.*$/
################################################################################ ################################################################################
## bsd stage ## bsd stage
...@@ -83,7 +85,7 @@ bsd: ...@@ -83,7 +85,7 @@ bsd:
<<: *not_triggered <<: *not_triggered
stage: package stage: package
script: script:
- export SUFFIX=$(/usr/local/bin/erl -noshell -eval '{{Y, MM, D}, {H, M, S}} = calendar:universal_time(), io:format("pre~4.10.0B~2.10.0B~2.10.0B~2.10.0B~2.10.0B~2.10.0B", [Y, MM, D, H, M, S]),init:stop()'); - export SUFFIX=$(if [ "$CI_BUILD_REF_NAME" = "master" ]; then echo ""; else /usr/local/bin/erl -noshell -eval '{{Y, MM, D}, {H, M, S}} = calendar:universal_time(), io:format("pre~4.10.0B~2.10.0B~2.10.0B~2.10.0B~2.10.0B~2.10.0B", [Y, MM, D, H, M, S]),init:stop()'; fi);
- export OS_VER=$(echo $CI_RUNNER_TAGS | sed 's/.*freebsd-\([0-9.]*\).*/\1/') - export OS_VER=$(echo $CI_RUNNER_TAGS | sed 's/.*freebsd-\([0-9.]*\).*/\1/')
- export ARCH=$(uname -m) - export ARCH=$(uname -m)
- export BRANCH=$(if [ "$CI_BUILD_REF_NAME" = "master" ]; then echo rel; else echo dev; fi) - export BRANCH=$(if [ "$CI_BUILD_REF_NAME" = "master" ]; then echo rel; else echo dev; fi)
...@@ -97,3 +99,4 @@ bsd: ...@@ -97,3 +99,4 @@ bsd:
refs: refs:
- master - master
- dev - dev
- /^dev-.*$/
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
{jsone, "~>1.2.3"}, {jsone, "~>1.2.3"},
fifo_utils, fifo_utils,
{msgpack, "0.3.5"}, {msgpack, "0.3.5"},
{dqe, ".*", {git, "https://github.com/dalmatinerdb/dqe.git", {tag, "v0.7.13"}}}, {dqe, ".*", {git, "https://gitlab.com/Project-FiFo/DalmatinerDB/dqe.git", {branch, "master"}}},
{otters, "~>0.2.0"}, {otters, "~>0.2.0"},
eper, eper,
recon recon
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{<<"dflow">>,{pkg,<<"dflow">>,<<"0.3.0">>},1}, {<<"dflow">>,{pkg,<<"dflow">>,<<"0.3.0">>},1},
{<<"dproto">>,{pkg,<<"dproto">>,<<"0.5.2">>},1}, {<<"dproto">>,{pkg,<<"dproto">>,<<"0.5.2">>},1},
{<<"dqe">>, {<<"dqe">>,
{git,"https://github.com/dalmatinerdb/dqe.git", {git,"https://gitlab.com/Project-FiFo/DalmatinerDB/dqe.git",
{ref,"6d8f70fa79c6ef438cfa73fc630b86281f612053"}}, {ref,"6d8f70fa79c6ef438cfa73fc630b86281f612053"}},
0}, 0},
{<<"dqe_fun">>,{pkg,<<"dqe_fun">>,<<"0.2.1">>},1}, {<<"dqe_fun">>,{pkg,<<"dqe_fun">>,<<"0.2.1">>},1},
......
VERSION=0.3.3 DEPS="erlang" "coreutils" "sudo" "grep" "zlib" "bzip2" "gcc49-libs"
COMPONENT_INTERNAL=dfe
COMPONENT=dalmatinerfe
DEPS="erlang" "coreutils" "sudo"
include ../../_build/default/lib/fifo_utils/priv/pkg.mk include ../../config.mk
include ../../_build/${REBARPROFILE}/lib/fifo_utils/priv/pkg.mk
.PHONY: prepare .PHONY: package prepare clean
prepare: prepare:
-rm -r $(STAGE_DIR)/$(COMPONENT) -rm -r $(STAGE_DIR)/$(COMPONENT)
cp -r ../../_build/${REBARPROFILE}/rel/$(COMPONENT_INTERNAL) $(STAGE_DIR)/$(COMPONENT) cp -r ../../_build/${REBARPROFILE}/rel/$(COMPONENT_INTERNAL) $(STAGE_DIR)/$(COMPONENT)
rm -rf $(STAGE_DIR)/$(COMPONENT)/lib/*/c_src
package: prepare $(FILE).tgz package: prepare $(FILE).tgz
clean: clean-pkg clean: clean-pkg
-rm *.tgz -rm *.tgz
INSTALL_DIR=usr/local/lib INSTALL_DIR=usr/local/lib
DEPS="coreutils" "sudo" DEPS="coreutils" "sudo" "bash"
REBARPROFILE ?= default REBARPROFILE ?= default
include ../../config.mk include ../../config.mk
...@@ -8,9 +8,9 @@ include ../../_build/${REBARPROFILE}/lib/fifo_utils/priv/pkgng.mk ...@@ -8,9 +8,9 @@ include ../../_build/${REBARPROFILE}/lib/fifo_utils/priv/pkgng.mk
.PHONY: package prepare clean .PHONY: package prepare clean
prepare: prepare:
-rm -r $(STAGE_DIR) -rm -r $(STAGE_DIR)/$(INSTALL_DIR)/$(COMPONENT_INTERNAL)
-rm $(STAGE_DIR)/+*
-rm $(STAGE_DIR)/plist
mkdir -p $(STAGE_DIR)/$(INSTALL_DIR) mkdir -p $(STAGE_DIR)/$(INSTALL_DIR)
cp -r ../../_build/${REBARPROFILE}/rel/$(COMPONENT_INTERNAL) $(STAGE_DIR)/$(INSTALL_DIR) cp -r ../../_build/${REBARPROFILE}/rel/$(COMPONENT_INTERNAL) $(STAGE_DIR)/$(INSTALL_DIR)/$(COMPONENT_INTERNAL)
rm -rf $(STAGE_DIR)/$(INSTALL_DIR)/lib/*/c_src rm -rf $(STAGE_DIR)/$(INSTALL_DIR)/$(COMPONENT_INTERNAL)/lib/*/c_src
mkdir -p $(STAGE_DIR)/usr/local/etc/rc.d
cp ../freebsd/dalmatinerfe $(STAGE_DIR)/usr/local/etc/rc.d/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment