Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit b37772e

Browse files
authored
try switching to official erlang docker image (#119)
* switching to official erlang docker image * upgrade counters app for otp-21.2 compatibility
1 parent ee1febe commit b37772e

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

.circleci/config.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
defaults: &defaults
2-
shell: /bin/bash
2+
shell: /bin/sh
33
working_directory: /home/circleci/census
44
docker:
5-
- image: tsloughter/erlang-alpine:20.0.1
6-
cmd: ["/bin/bash"]
5+
- image: erlang:21.2-alpine
6+
cmd: ["/bin/sh"]
77

88
version: 2
99
jobs:
@@ -41,12 +41,9 @@ jobs:
4141
steps:
4242
- checkout
4343

44-
- attach_workspace:
45-
at: /home/circleci/census
46-
4744
- restore_cache:
4845
keys:
49-
- erlang-plt-20.0.1
46+
- erlang-plt-21.2
5047

5148
- restore_cache:
5249
keys:
@@ -57,17 +54,14 @@ jobs:
5754
command: rebar3 dialyzer
5855

5956
- save-cache:
60-
key: erlang-plt-20.0.1
57+
key: erlang-plt-21.2
6158
paths:
62-
- /root/.cache/rebar3/rebar3_20.0.1_plt
59+
- /root/.cache/rebar3/rebar3_21.2_plt
6360
xref:
6461
<<: *defaults
6562
steps:
6663
- checkout
6764

68-
- attach_workspace:
69-
at: /home/circleci/census
70-
7165
- restore_cache:
7266
keys:
7367
- census-{{ checksum "rebar.lock" }}
@@ -81,9 +75,6 @@ jobs:
8175
steps:
8276
- checkout
8377

84-
- attach_workspace:
85-
at: /home/circleci/census
86-
8778
- restore_cache:
8879
keys:
8980
- census-{{ checksum "rebar.lock" }}
@@ -97,9 +88,6 @@ jobs:
9788
steps:
9889
- checkout
9990

100-
- attach_workspace:
101-
at: /home/circleci/census
102-
10391
- restore_cache:
10492
keys:
10593
- census-{{ checksum "rebar.lock" }}

rebar.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{deps, [{wts, "~> 0.3"},
77
{ctx, "~> 0.5"},
88
{jsx, "~> 2.9"},
9-
{counters, "~> 0.2"}]}.
9+
{counters, "~> 0.2.1"}]}.
1010

1111
{project_plugins, [covertool,
1212
rebar3_gpb_plugin,

rebar.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{"1.1.0",
2-
[{<<"counters">>,{pkg,<<"counters">>,<<"0.2.0">>},0},
2+
[{<<"counters">>,{pkg,<<"counters">>,<<"0.2.1">>},0},
33
{<<"ctx">>,{pkg,<<"ctx">>,<<"0.5.0">>},0},
44
{<<"jsx">>,{pkg,<<"jsx">>,<<"2.9.0">>},0},
55
{<<"rfc3339">>,{pkg,<<"rfc3339">>,<<"0.9.0">>},1},
66
{<<"wts">>,{pkg,<<"wts">>,<<"0.3.0">>},0}]}.
77
[
88
{pkg_hash,[
9-
{<<"counters">>, <<"EF00F33404FDD9BD233F9B7966233222469E4560DBE1C712EA2E1AB63BB8FEFD">>},
9+
{<<"counters">>, <<"AA3D97E88F92573488987193D0F48EFCE0F3B2CD1443BF4EE760BC7F99322F0C">>},
1010
{<<"ctx">>, <<"78E0F16712E12D707A7F34277381B8E193D7C71EAA24D37330DC02477C09EDA5">>},
1111
{<<"jsx">>, <<"D2F6E5F069C00266CAD52FB15D87C428579EA4D7D73A33669E12679E203329DD">>},
1212
{<<"rfc3339">>, <<"2075653DC9407541C84B1E15F8BDA2ABE95FB17C9694025E079583F2D19C1060">>},

0 commit comments

Comments
 (0)