Skip to content

Commit 0ef2cc9

Browse files
authored
CI housekeeping (#114)
List of changes: - bump x509 (test-only) to 0.9.2 - fix scope drainer_test - shift test matrix to Elixir 1.15/OTP 25 and Elixir 1.19/OTP 28 - support latest Elixir/Erlang in latest job - support runner to ubuntu-24.04 and actions/checkout to v6 - use quote versions as strings - set min Elixir requirement to 1.15, tally with :plug
1 parent fd0841f commit 0ef2cc9

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ on:
88

99
jobs:
1010
test:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
env:
1313
MIX_ENV: test
1414
strategy:
1515
fail-fast: false
1616
matrix:
1717
include:
1818
- pair:
19-
elixir: 1.14
20-
otp: 24.2
19+
elixir: "1.15"
20+
otp: "25"
2121
- pair:
22-
elixir: 1.17
23-
otp: 27.3
22+
elixir: "1.19"
23+
otp: "29"
2424
lint: lint
2525
steps:
26-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v6
2727

2828
- uses: erlef/setup-beam@v1
2929
with:
@@ -47,18 +47,18 @@ jobs:
4747
- run: mix test
4848

4949
test_cowboy_latest:
50-
runs-on: ubuntu-22.04
50+
runs-on: ubuntu-24.04
5151
env:
5252
MIX_ENV: test
5353
strategy:
5454
fail-fast: false
5555
steps:
56-
- uses: actions/checkout@v2
56+
- uses: actions/checkout@v6
5757

5858
- uses: erlef/setup-beam@v1
5959
with:
60-
otp-version: 27.3
61-
elixir-version: 1.17
60+
otp-version: master
61+
elixir-version: main
6262

6363
- run: mix deps.unlock cowboy cowlib ranch && mix deps.get --only test
6464

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ defmodule Plug.Cowboy.MixProject do
99
[
1010
app: :plug_cowboy,
1111
version: @version,
12-
elixir: "~> 1.11",
12+
elixir: "~> 1.15",
1313
deps: deps(),
1414
package: package(),
1515
description: @description,

mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
2222
"telemetry": {:hex, :telemetry, "1.1.0", "a589817034a27eab11144ad24d5c0f9fab1f58173274b1e9bae7074af9cbee51", [:rebar3], [], "hexpm", "b727b2a1f75614774cff2d7565b64d0dfa5bd52ba517f16543e6fc7efcc0df48"},
2323
"unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
24-
"x509": {:hex, :x509, "0.8.8", "aaf5e58b19a36a8e2c5c5cff0ad30f64eef5d9225f0fd98fb07912ee23f7aba3", [:mix], [], "hexpm", "ccc3bff61406e5bb6a63f06d549f3dba3a1bbb456d84517efaaa210d8a33750f"},
24+
"x509": {:hex, :x509, "0.9.2", "a75aa605348abd905990f3d2dc1b155fcde4e030fa2f90c4a91534405dce0f6e", [:mix], [], "hexpm", "4c5ede75697e565d4b0f5be04c3b71bb1fd3a090ea243af4bd7dae144e48cfc7"},
2525
}

test/plug/cowboy/drainer_test.exs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ defmodule Plug.Cowboy.DrainerTest do
2525
Process.register(self(), __MODULE__)
2626

2727
# Supervisor and listener started
28-
assert {:ok, pid} = start_link(refs: :all, shutdown: 1000, drain_check_interval: 10)
28+
assert {:ok, pid} =
29+
start_link(refs: [__MODULE__.HTTP], shutdown: 1000, drain_check_interval: 10)
30+
2931
assert :running == get_status()
3032

3133
# Start a request that will keep a connection open for a while

0 commit comments

Comments
 (0)