Skip to content

Commit 1542e10

Browse files
committed
vump dev.2: rebase onto current pinterest master
1 parent b281ab5 commit 1542e10

3 files changed

Lines changed: 9 additions & 13 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@ on:
55
push:
66
branches:
77
- master
8+
- 2.0.0-dev.2
89
pull_request:
910
branches:
1011
- master
1112

1213
jobs:
1314
format:
1415
name: Format (Elixir ${{ matrix.pair.elixir }} / OTP ${{ matrix.pair.otp }})
15-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-22.04
1617
strategy:
1718
fail-fast: false
1819
matrix:
1920
include:
2021
- pair:
21-
elixir: 1.11
22-
otp: 23
22+
elixir: 1.12
23+
otp: 24
2324
env:
2425
MIX_ENV: test
2526
steps:
@@ -34,17 +35,14 @@ jobs:
3435
run: mix format --check-formatted
3536
test:
3637
name: Test (Elixir ${{ matrix.pair.elixir }} / OTP ${{ matrix.pair.otp }})
37-
runs-on: ubuntu-20.04
38+
runs-on: ubuntu-22.04
3839
strategy:
3940
fail-fast: false
4041
matrix:
4142
include:
4243
- pair:
43-
elixir: 1.7
44-
otp: 22
45-
- pair:
46-
elixir: 1.11
47-
otp: 23
44+
elixir: 1.12
45+
otp: 24
4846
coverage: true
4947
env:
5048
MIX_ENV: test

lib/thrift/binary/framed/client.ex

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,7 @@ defmodule Thrift.Binary.Framed.Client do
333333
TApplicationException.exception(
334334
type: :bad_sequence_id,
335335
message:
336-
"Invalid sequence id. The client sent #{seq_id}, but the server replied with #{
337-
mismatched_seq_id
338-
}"
336+
"Invalid sequence id. The client sent #{seq_id}, but the server replied with #{mismatched_seq_id}"
339337
)
340338

341339
{:error, {:exception, exception}}

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ defmodule Thrift.Mixfile do
1111
Forked by Simpli.fi for internal versioning
1212
"""
1313

14-
@version "2.0.0-dev.1"
14+
@version "2.0.0-dev.2"
1515
@project_url "https://github.com/simplifi/elixir-thrift"
1616

1717
def project do

0 commit comments

Comments
 (0)