Skip to content

Commit 2a5741a

Browse files
authored
Merge pull request #76 from dwyl/fix-ci
Update ci.yml file to user available elixir version
2 parents 16be706 + ad919d1 commit 2a5741a

5 files changed

Lines changed: 20 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v2
1515
- name: Set up Elixir
16-
uses: erlef/setup-elixir@885971a72ed1f9240973bd92ab57af8c1aa68f24
16+
uses: erlef/setup-beam@v1
1717
with:
18-
elixir-version: '1.12.3' # Define the elixir version [required]
19-
otp-version: '24.0.2' # Define the OTP version [required]
18+
elixir-version: '1.14.2' # Define the elixir version [required]
19+
otp-version: '25.1.2' # Define the OTP version [required]
2020
- name: Restore dependencies cache
2121
uses: actions/cache@v2
2222
with:
@@ -31,3 +31,4 @@ jobs:
3131
MIX_ENV: test
3232
- name: Upload coverage to Codecov
3333
uses: codecov/codecov-action@v1
34+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The _easiest_ way to add Google OAuth authentication to your Elixir Apps.
66

77
![sign-in-with-google-buttons](https://user-images.githubusercontent.com/194400/69637172-07a67900-1050-11ea-9e25-2b9e84a49d91.png)
88

9-
![Build Status](https://img.shields.io/travis/com/dwyl/elixir-auth-google/master?color=bright-green&style=flat-square)
9+
![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/dwyl/elixir-auth-google/ci.yml?label=build&style=flat-square&branch=main)
1010
[![codecov.io](https://img.shields.io/codecov/c/github/dwyl/elixir-auth-google/master.svg?style=flat-square)](http://codecov.io/github/dwyl/elixir-auth-google?branch=main)
1111
[![Hex.pm](https://img.shields.io/hexpm/v/elixir_auth_google?color=brightgreen&style=flat-square)](https://hex.pm/packages/elixir_auth_google)
1212
[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat-square)](https://github.com/dwyl/elixir-auth-google/issues)

config/test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use Mix.Config
1+
import Mix.Config
22

33
config :elixir_auth_google,
44
client_id: "631770888008-6n0oruvsm16kbkqg6u76p5cv5kfkcekt.apps.googleusercontent.com",

mix.exs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ defmodule ElixirAuthGoogle.MixProject do
1313
deps: deps(),
1414
description: @description,
1515
package: package(),
16+
aliases: aliases(),
1617
# coverage
1718
test_coverage: [tool: ExCoveralls],
1819
preferred_cli_env: [
20+
c: :test,
1921
coveralls: :test,
2022
"coveralls.json": :test,
21-
"coveralls.html": :test
23+
"coveralls.html": :test,
24+
t: :test
2225
]
2326
]
2427
end
@@ -55,4 +58,12 @@ defmodule ElixirAuthGoogle.MixProject do
5558
files: ~w(lib LICENSE mix.exs README.md .formatter.exs)
5659
]
5760
end
61+
62+
defp aliases do
63+
[
64+
t: ["test"],
65+
c: ["coveralls.html"]
66+
]
67+
end
68+
5869
end

test/elixir_auth_google_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ defmodule ElixirAuthGoogleTest do
121121

122122
mock_get_env = fn :elixir_auth_google, :callback_path -> "/special/callback" end
123123

124-
with_mock Application, [get_env: mock_get_env] do
124+
with_mock Application, get_env: mock_get_env do
125125
assert ElixirAuthGoogle.generate_redirect_uri(conn) ==
126126
"https://foobar.com/special/callback"
127127
end
@@ -135,7 +135,7 @@ defmodule ElixirAuthGoogleTest do
135135

136136
mock_get_env = fn "GOOGLE_CALLBACK_PATH" -> "/very/special/callback" end
137137

138-
with_mock System, [get_env: mock_get_env] do
138+
with_mock System, get_env: mock_get_env do
139139
assert ElixirAuthGoogle.generate_redirect_uri(conn) ==
140140
"https://foobar.com/very/special/callback"
141141
end

0 commit comments

Comments
 (0)