diff options
author | Tristan Sloughter <[email protected]> | 2019-05-17 10:13:48 -0600 |
---|---|---|
committer | GitHub <[email protected]> | 2019-05-17 10:13:48 -0600 |
commit | ffd657605bc3cd390c5bb3270ccb38c540226da0 (patch) | |
tree | e4502e9ec32034afd80ddc5010f534b183aab308 | |
parent | ead9e974a88344154506be95285cd98f64d7ff0f (diff) | |
parent | 5158c869f17878ba6c9e99563a9865ebe8c59d49 (diff) | |
download | relx-ffd657605bc3cd390c5bb3270ccb38c540226da0.tar.gz relx-ffd657605bc3cd390c5bb3270ccb38c540226da0.tar.bz2 relx-ffd657605bc3cd390c5bb3270ccb38c540226da0.zip |
Merge pull request #706 from erlware/try-cirrus
try cirrus ci
-rw-r--r-- | .circleci/config.yml | 39 | ||||
-rw-r--r-- | .cirrus.yml | 23 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .travis.yml | 35 | ||||
-rw-r--r-- | README.md | 3 | ||||
-rw-r--r-- | rebar.config | 3 | ||||
-rw-r--r-- | test/rlx_archive_SUITE.erl | 2 | ||||
-rw-r--r-- | test/rlx_command_SUITE.erl | 2 | ||||
-rw-r--r-- | test/rlx_discover_SUITE.erl | 2 | ||||
-rw-r--r-- | test/rlx_eunit_SUITE.erl | 2 | ||||
-rw-r--r-- | test/rlx_extended_bin_SUITE.erl | 6 | ||||
-rw-r--r-- | test/rlx_release_SUITE.erl | 2 |
12 files changed, 35 insertions, 85 deletions
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/[email protected] - -jobs: - ct: - parameters: - tag: - description: The docker tag to use. - type: string - default: "21.2" - executor: - name: rebar3/erlang - tag: <<parameters.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/.cirrus.yml b/.cirrus.yml new file mode 100644 index 0000000..b49a2b6 --- /dev/null +++ b/.cirrus.yml @@ -0,0 +1,23 @@ +test_task: + use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' + container: + matrix: + - image: erlang:22 + - 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" + +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 @@ -14,5 +14,6 @@ test/*_data _rel/* .* !.circleci +!.cirrus.yml erl_crash.dump rebar 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: - irc: - channels: - - "irc.freenode.org#erlware" - use_notice: true - skip_join: true @@ -1,5 +1,4 @@ -[](https://travis-ci.org/erlware/relx) -[](https://circleci.com/gh/erlware/relx) +[](https://cirrus-ci.com/github/erlware/relx) Relx ======= 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}. 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 041afca..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,30}}]. + [{timetrap,{seconds,300}}]. init_per_suite(Config) -> Config. @@ -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, @@ -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 [email protected]\n\n" "-args_file " ++ VmArgs2 ++ "\n\n" "-setcookie cookie\n"), ec_file:write(VmArgs2, ""), 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. |