Skip to content

Commit c612469

Browse files
authored
CI improvements (#159)
1 parent 21ec7c5 commit c612469

File tree

3 files changed

+27
-63
lines changed

3 files changed

+27
-63
lines changed

.github/workflows/main.yml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
include:
13-
- otp: 23.0
13+
- otp: 24.0
14+
elixir: 1.12.1
15+
lint: true
16+
integration: true
17+
- otp: 23.3
1418
elixir: 1.11.4
1519
lint: true
16-
- otp: 23.0
17-
elixir: 1.10.3
20+
- otp: 23.3
21+
elixir: 1.10.4
22+
- otp: 22.3
23+
elixir: 1.10.4
1824
- otp: 22.3
19-
elixir: 1.10.3
20-
- otp: 22.1
2125
elixir: 1.9.4
22-
- otp: 21.3
23-
elixir: 1.8.2
2426
env:
2527
MIX_ENV: test
2628
steps:
@@ -43,4 +45,21 @@ jobs:
4345
run: mix deps.compile
4446

4547
- name: Run tests
46-
run: mix test.integration --trace
48+
run: mix test --trace
49+
50+
- name: Install protoc
51+
if: ${{matrix.integration}}
52+
run: |
53+
wget https://github.com/protocolbuffers/protobuf/releases/download/v3.12.3/protoc-3.12.3-linux-x86_64.zip
54+
unzip protoc-3.12.3-linux-x86_64.zip
55+
echo "./bin" >> $GITHUB_PATH
56+
57+
- name: Compile .proto files to Elixir with protoc
58+
if: ${{matrix.integration}}
59+
run: |
60+
make clean
61+
make gen-protos
62+
63+
- name: Run integration tests
64+
if: ${{matrix.integration}}
65+
run: mix test --only integration

.travis.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

mix.exs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ defmodule Protobuf.Mixfile do
1717
escript: escript(),
1818
description: description(),
1919
package: package(),
20-
aliases: aliases(),
21-
preferred_cli_env: ["test.integration": :test],
2220
docs: docs()
2321
]
2422
end
@@ -69,22 +67,4 @@ defmodule Protobuf.Mixfile do
6967
source_ref: "v#{@version}"
7068
]
7169
end
72-
73-
defp aliases do
74-
["test.integration": &run_integration_tests/1]
75-
end
76-
77-
defp run_integration_tests(args) do
78-
IO.puts("==> make clean")
79-
Mix.shell().cmd("make clean")
80-
81-
IO.puts("==> make gen-protos")
82-
Mix.shell().cmd("make gen-protos")
83-
84-
args = ["--only", "integration" | args]
85-
args = if IO.ANSI.enabled?(), do: ["--color" | args], else: ["--no-color" | args]
86-
87-
IO.puts("==> mix test #{Enum.join(args, " ")}")
88-
Mix.Task.run("test", args)
89-
end
9070
end

0 commit comments

Comments
 (0)