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

Merge branch 'test' into dev

parents 7ba78a7c acb114c5
Pipeline #12948447 passed with stage
in 1 minute and 15 seconds
......@@ -16,7 +16,6 @@ stages:
################################################################################
## package stage
################################################################################
# we can't dialyzer because: https://github.com/lrascao/rebar3_gpb_plugin/issues/51
#trigger_dialyzer:
# <<: *is_triggered
# image: erlang:19
......@@ -25,7 +24,7 @@ stages:
# - ./rebar3 upgrade $DOWNSTREAM_LIBRARY
# - ./rebar3 dialyzer
# tags:
# - gitlab-org-high-cpu
- gitlab-org-high-cpu
trigger_xref:
<<: *is_triggered
......@@ -46,7 +45,7 @@ smartos:
<<: *not_triggered
stage: package
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 BRANCH=$(if [ "$CI_BUILD_REF_NAME" = "master" ]; then echo rel; else echo dev; fi)
- gmake dist
......@@ -62,13 +61,14 @@ smartos:
refs:
- master
- dev
- /^dev-.*$/
smartos_test:
stage: test
script:
- ./rebar3 as lint lint
- ./rebar3 xref
# - ./rebar3 dialyzer
#- ./rebar3 dialyzer
tags:
- erlang-19
- smartos
......@@ -76,6 +76,7 @@ smartos_test:
- pipelines
- master
- dev
- /^dev-.*$/
################################################################################
## bsd stage
......@@ -84,7 +85,7 @@ bsd:
<<: *not_triggered
stage: package
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 ARCH=$(uname -m)
- export BRANCH=$(if [ "$CI_BUILD_REF_NAME" = "master" ]; then echo rel; else echo dev; fi)
......@@ -98,3 +99,4 @@ bsd:
refs:
- master
- dev
- /^dev-.*$/
VERSION=0.3.3
COMPONENT_INTERNAL=dpx
COMPONENT=dalmatinerpx
DEPS="erlang" "coreutils" "sudo"
DEPS="erlang" "coreutils" "sudo" "grep" "zlib" "bzip2" "gcc49-libs"
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:
-rm -r $(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
clean: clean-pkg
-rm *.tgz
INSTALL_DIR=usr/local/lib
DEPS="coreutils" "sudo"
DEPS="coreutils" "sudo" "bash"
REBARPROFILE ?= default
include ../../config.mk
......@@ -8,9 +8,9 @@ include ../../_build/${REBARPROFILE}/lib/fifo_utils/priv/pkgng.mk
.PHONY: package prepare clean
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)
cp -r ../../_build/${REBARPROFILE}/rel/$(COMPONENT_INTERNAL) $(STAGE_DIR)/$(INSTALL_DIR)
rm -rf $(STAGE_DIR)/$(INSTALL_DIR)/lib/*/c_src
mkdir -p $(STAGE_DIR)/usr/local/etc/rc.d/
cp ../freebsd/dalmatinerpx $(STAGE_DIR)/usr/local/etc/rc.d/
cp -r ../../_build/${REBARPROFILE}/rel/$(COMPONENT_INTERNAL) $(STAGE_DIR)/$(INSTALL_DIR)/$(COMPONENT_INTERNAL)
rm -rf $(STAGE_DIR)/$(INSTALL_DIR)/$(COMPONENT_INTERNAL)/lib/*/c_src
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