From 091e7351d8cac31375ddd5268c235715a1511784 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Wed, 3 Apr 2019 16:39:24 -0600 Subject: try cirrus ci --- .cirrus.yml | 9 +++++++++ .gitignore | 1 + 2 files changed, 10 insertions(+) create mode 100644 .cirrus.yml diff --git a/.cirrus.yml b/.cirrus.yml new file mode 100644 index 0000000..bec8f21 --- /dev/null +++ b/.cirrus.yml @@ -0,0 +1,9 @@ +container: + image: circleci/erlang:21 + +check_task: + # rebar3_cache: + # folder: _build + # fingerprint_script: cat rebar.lock + # populate_script: rebar compile + test_script: rebar3 ct diff --git a/.gitignore b/.gitignore index 287aef8..ce87711 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,6 @@ test/*_data _rel/* .* !.circleci +!.cirrus.yml erl_crash.dump rebar -- cgit v1.2.3 From fc7df7461507fae28ea2402ebe2840bec35c53af Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Wed, 3 Apr 2019 17:23:56 -0600 Subject: add osx test run --- .cirrus.yml | 26 +++++++++++++++++++------- rebar.config | 3 ++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index bec8f21..2756823 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,9 +1,21 @@ -container: - image: circleci/erlang:21 - check_task: - # rebar3_cache: - # folder: _build - # fingerprint_script: cat rebar.lock - # populate_script: rebar compile + container: + image: circleci/erlang:21 + rebar3_cache: + folder: _build + fingerprint_script: cat rebar.lock + populate_script: rebar3 compile --deps_only + compile_script: rebar3 compile test_script: rebar3 ct + always: + junit_artifacts: + path: "_build/test/logs/ct_run.*/junit_report.xml" + +osx_check_task: + osx_instance: + image: mojave-base + install_script: brew install erlang + test_script: | + wget https://s3.amazonaws.com/rebar3/rebar3 + chmod +x rebar3 + ./rebar3 ct diff --git a/rebar.config b/rebar.config index d7f5312..285b1ce 100644 --- a/rebar.config +++ b/rebar.config @@ -69,7 +69,8 @@ {override, providers, [{erl_opts, [no_debug_info]}]} ]}. -{ct_opts, [{cover_spec, "cover.spec"}]}. +{ct_opts, [{cover_spec, "cover.spec"}, + {ct_hooks, [cth_surefire]}]}. {cover_enabled, true}. {cover_print_enabled, true}. -- cgit v1.2.3 From 4c0df35b8fa1dc9d2e45b92cf0c4f9867ef90f90 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Wed, 3 Apr 2019 18:02:54 -0600 Subject: split out build task --- .cirrus.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2756823..d7e7e3e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,11 +1,19 @@ -check_task: +build_task: container: image: circleci/erlang:21 rebar3_cache: folder: _build fingerprint_script: cat rebar.lock populate_script: rebar3 compile --deps_only - compile_script: rebar3 compile + +test_task: + container: + image: circleci/erlang:21 + depends_on: + - build + rebar3_cache: + folder: _build + fingerprint_script: cat rebar.lock test_script: rebar3 ct always: junit_artifacts: -- cgit v1.2.3 From f814cd73d7fb97751434fbd1099ec1abb9068769 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Mon, 13 May 2019 11:46:43 -0600 Subject: add testing of otp 18 19 and 20 --- .cirrus.yml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d7e7e3e..38fc107 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,20 +1,12 @@ -build_task: - container: - image: circleci/erlang:21 - rebar3_cache: - folder: _build - fingerprint_script: cat rebar.lock - populate_script: rebar3 compile --deps_only - test_task: container: - image: circleci/erlang:21 - depends_on: - - build - rebar3_cache: - folder: _build - fingerprint_script: cat rebar.lock - test_script: rebar3 ct + matrix: + - image: erlang:21 + - image: erlang:20 + - image: erlang:19 + - image: erlang:18 + test_script: | + rebar3 ct always: junit_artifacts: path: "_build/test/logs/ct_run.*/junit_report.xml" -- cgit v1.2.3 From cb1b86273721a9dcb8999039c09d6629aac310db Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Mon, 13 May 2019 13:57:54 -0600 Subject: try to fix failing test --- test/rlx_extended_bin_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl index 041afca..807b676 100644 --- a/test/rlx_extended_bin_SUITE.erl +++ b/test/rlx_extended_bin_SUITE.erl @@ -1798,7 +1798,7 @@ start_fail_when_nonreadable_argsfile(Config) -> LibDir1 = proplists:get_value(lib1, Config), VmArgs = filename:join([LibDir1, "vm.args"]), VmArgs2 = VmArgs ++ ".nonreadable", - ec_file:write(VmArgs, "-name foo\n\n" + ec_file:write(VmArgs, "-name foo@127.0.0.1\n\n" "-args_file " ++ VmArgs2 ++ "\n\n" "-setcookie cookie\n"), ec_file:write(VmArgs2, ""), -- cgit v1.2.3 From 1984d41553b8294591d40daf65d6e38dafdce9bb Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Mon, 13 May 2019 14:20:20 -0600 Subject: see if others pass without this one --- test/rlx_extended_bin_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl index 807b676..8788bb2 100644 --- a/test/rlx_extended_bin_SUITE.erl +++ b/test/rlx_extended_bin_SUITE.erl @@ -86,7 +86,7 @@ init_per_testcase(_, Config) -> all() -> [start_sname_in_other_argsfile, start_preserves_arguments, start_nodetool_with_data_from_argsfile, start_upgrade_escript_with_argsfile_data, start_fail_when_no_name, start_fail_when_multiple_names, - start_fail_when_missing_argsfile, start_fail_when_nonreadable_argsfile, + start_fail_when_missing_argsfile, %% start_fail_when_nonreadable_argsfile, start_fail_when_relative_argsfile, start_fail_when_circular_argsfiles, ping, shortname_ping, longname_ping, attach, pid, restart, reboot, escript, remote_console, shortname_remote_console, replace_os_vars, replace_os_vars_sys_config_vm_args_src, replace_os_vars_multi_node, -- cgit v1.2.3 From a8c7a33fb485ec0cfa0bb235d51e1fbb5c94f932 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 14 May 2019 13:28:37 -0600 Subject: try with compute credits --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 38fc107..b028272 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,4 +1,5 @@ test_task: + use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' container: matrix: - image: erlang:21 -- cgit v1.2.3 From f6abbf18842f9f8464e01e7e8c258741ca51adbf Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 14 May 2019 17:01:00 -0600 Subject: increase timetrap --- test/rlx_archive_SUITE.erl | 2 +- test/rlx_command_SUITE.erl | 2 +- test/rlx_discover_SUITE.erl | 2 +- test/rlx_eunit_SUITE.erl | 2 +- test/rlx_extended_bin_SUITE.erl | 2 +- test/rlx_release_SUITE.erl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/rlx_archive_SUITE.erl b/test/rlx_archive_SUITE.erl index 68a5b07..8d30915 100644 --- a/test/rlx_archive_SUITE.erl +++ b/test/rlx_archive_SUITE.erl @@ -18,7 +18,7 @@ -include_lib("kernel/include/file.hrl"). suite() -> - [{timetrap, {seconds, 30}}]. + [{timetrap, {seconds, 120}}]. init_per_suite(Config) -> Config. diff --git a/test/rlx_command_SUITE.erl b/test/rlx_command_SUITE.erl index e0beec1..46664ab 100644 --- a/test/rlx_command_SUITE.erl +++ b/test/rlx_command_SUITE.erl @@ -33,7 +33,7 @@ -include_lib("eunit/include/eunit.hrl"). suite() -> - [{timetrap,{seconds,30}}]. + [{timetrap,{seconds,120}}]. init_per_suite(Config) -> Config. diff --git a/test/rlx_discover_SUITE.erl b/test/rlx_discover_SUITE.erl index 36d77ae..9385229 100644 --- a/test/rlx_discover_SUITE.erl +++ b/test/rlx_discover_SUITE.erl @@ -34,7 +34,7 @@ -include_lib("eunit/include/eunit.hrl"). suite() -> - [{timetrap,{seconds,30}}]. + [{timetrap,{seconds,120}}]. init_per_suite(Config) -> Config. diff --git a/test/rlx_eunit_SUITE.erl b/test/rlx_eunit_SUITE.erl index 874e5a6..c7c0751 100644 --- a/test/rlx_eunit_SUITE.erl +++ b/test/rlx_eunit_SUITE.erl @@ -30,7 +30,7 @@ -include_lib("eunit/include/eunit.hrl"). suite() -> - [{timetrap,{seconds,30}}]. + [{timetrap,{seconds,120}}]. init_per_suite(Config) -> Config. diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl index 8788bb2..a23d571 100644 --- a/test/rlx_extended_bin_SUITE.erl +++ b/test/rlx_extended_bin_SUITE.erl @@ -66,7 +66,7 @@ -define(SLEEP_TIME, 2500). suite() -> - [{timetrap,{seconds,30}}]. + [{timetrap,{seconds,120}}]. init_per_suite(Config) -> Config. diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index 052b5c2..d4a86be 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -64,7 +64,7 @@ -include_lib("kernel/include/file.hrl"). suite() -> - [{timetrap,{seconds,30}}]. + [{timetrap,{seconds,120}}]. init_per_suite(Config) -> Config. -- cgit v1.2.3 From 02e3d99d6a93e8c9ee982348366ee607aec45cdb Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 14 May 2019 17:25:21 -0600 Subject: remove travis and circle --- .circleci/config.yml | 39 --------------------------------------- .travis.yml | 35 ----------------------------------- README.md | 3 +-- 3 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index ca75335..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: 2.1 -orbs: - rebar3: tsloughter/rebar3@0.6.3 - -jobs: - ct: - parameters: - tag: - description: The docker tag to use. - type: string - default: "21.2" - executor: - name: rebar3/erlang - tag: <> - steps: - - checkout - - rebar3/ct - # Delete OTP files which don't need to be stored - - run: | - find _build/test/logs -type d -and \( -path "*/erts-*" -or -path "*/kernel-*" -or -path "*/stdlib-*" \) -exec rm -rf '{}' \+ || true - find _build/test/logs -type f -name "*.beam" -exec rm -rf '{}' \+ || true - - store_artifacts: - path: _build/test/logs - -workflows: - build-test: - jobs: - - ct: - name: "21" - tag: "21.2" - - ct: - name: "20" - tag: "20" - - ct: - name: "19" - tag: "19" - - ct: - name: "18" - tag: "18" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4e4f877..0000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -language: erlang -matrix: - include: - - os: linux - sudo: required - otp_release: 17.5 - - os: osx - sudo: required - language: generic -before_script: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - ## should eventually use a tap that has previous erlang versions here - ## as this only uses the latest erlang available via brew - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install erlang; fi - - wget https://s3.amazonaws.com/rebar3/rebar3 - - chmod +x rebar3 -script: "./rebar3 update && ./rebar3 ct" -after_failure: - ## Useful for troubleshooting to view test logs - - find _build/test/logs/ct_run*/lib*logs/run*/log_private/*-output*/*/log -type f -name "erlang*" -exec ls -1rt "{}" \+ | xargs -I % sh -c 'echo "\n\n%"; cat %' -branches: - only: - - master -addons: - hostname: travis.dev - hosts: - - travis.dev -notifications: - email: - - core@erlware.org - irc: - channels: - - "irc.freenode.org#erlware" - use_notice: true - skip_join: true diff --git a/README.md b/README.md index dfc2ef2..ce04617 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -[![Build Status](https://travis-ci.org/erlware/relx.png?branch=master)](https://travis-ci.org/erlware/relx) -[![CircleCI](https://circleci.com/gh/erlware/relx.svg?style=svg)](https://circleci.com/gh/erlware/relx) +[![Build Status](https://api.cirrus-ci.com/github/erlware/relx.svg)](https://cirrus-ci.com/github/erlware/relx) Relx ======= -- cgit v1.2.3 From 6b1b0e32e71ac8111f8b60a5aee0cac4ce510e2c Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 17 May 2019 09:24:41 -0600 Subject: add otp 22 to cirrus test matrix --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index b028272..b49a2b6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,6 +2,7 @@ test_task: use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' container: matrix: + - image: erlang:22 - image: erlang:21 - image: erlang:20 - image: erlang:19 -- cgit v1.2.3 From 5158c869f17878ba6c9e99563a9865ebe8c59d49 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 17 May 2019 09:48:39 -0600 Subject: increase timetrap for otp 22 --- test/rlx_extended_bin_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl index a23d571..8444cb4 100644 --- a/test/rlx_extended_bin_SUITE.erl +++ b/test/rlx_extended_bin_SUITE.erl @@ -66,7 +66,7 @@ -define(SLEEP_TIME, 2500). suite() -> - [{timetrap,{seconds,120}}]. + [{timetrap,{seconds,300}}]. init_per_suite(Config) -> Config. -- cgit v1.2.3