From 4f087f85a54e9f5840fcd02fba2cfeab25e78a42 Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Tue, 28 Dec 2021 14:14:26 -0700 Subject: [PATCH] Add elixir 1.13 to matrix; drop OTP 21 support (#55) * Add elixir 1.13 to matrix; drop OTP 21 support --- .github/elixir-test-matrix.json | 27 +++++---------------------- .github/erlang-test-matrix.json | 12 +++--------- .github/workflows/elixir.yml | 26 +++++++++++++------------- .github/workflows/erlang.yml | 10 +++++----- 4 files changed, 26 insertions(+), 49 deletions(-) diff --git a/.github/elixir-test-matrix.json b/.github/elixir-test-matrix.json index a232340..9d701b2 100644 --- a/.github/elixir-test-matrix.json +++ b/.github/elixir-test-matrix.json @@ -1,10 +1,11 @@ { "otp_version": [ - "24.0.6", - "23.3.4.7", - "22.3.4.21" + "24.2", + "23.3.4.10", + "22.3.4.24" ], "elixir_version": [ + "1.13.1", "1.12.3", "1.11.4" ], @@ -13,23 +14,5 @@ ], "os": [ "ubuntu-18.04" - ], - "include": [ - { - "otp_version": "21.3.8.24", - "elixir_version": "1.10.4", - "rebar3_version": "3.15.2" - }, - { - "otp_version": "21.3.8.24", - "elixir_version": "1.11.4", - "rebar3_version": "3.15.2" - } - ], - "exclude": [ - { - "otp_version": "21.3.8.24", - "elixir_version": "1.12.3" - } ] -} \ No newline at end of file +} diff --git a/.github/erlang-test-matrix.json b/.github/erlang-test-matrix.json index aabc044..0425860 100644 --- a/.github/erlang-test-matrix.json +++ b/.github/erlang-test-matrix.json @@ -1,19 +1,13 @@ { "otp_version": [ - "24.0.6", - "23.3.4.7", - "22.3.4.21" + "24.2", + "23.3.4.10", + "22.3.4.24" ], "rebar3_version": [ "3.16.1" ], "os": [ "ubuntu-18.04" - ], - "include": [ - { - "otp_version": "21.3.8.24", - "rebar3_version": "3.15.2" - } ] } diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index ce6c7fb..774d59d 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -19,7 +19,7 @@ jobs: - name: Read file id: set-matrix run: | - matrixStringifiedObject="{\"otp_version\":[\"24.0.6\",\"23.3.4.7\",\"22.3.4.21\"],\"elixir_version\":[\"1.12.3\",\"1.11.4\"],\"rebar3_version\":[\"3.16.1\"],\"os\":[\"ubuntu-18.04\"],\"include\":[{\"otp_version\":\"21.3.8.24\",\"elixir_version\":\"1.10.4\",\"rebar3_version\":\"3.15.2\"},{\"otp_version\":\"21.3.8.24\",\"elixir_version\":\"1.11.4\",\"rebar3_version\":\"3.15.2\"}],\"exclude\":[{\"otp_version\":\"21.3.8.24\",\"elixir_version\":\"1.12.3\"}]}" + matrixStringifiedObject="{\"otp_version\":[\"24.2\",\"23.3.4.10\",\"22.3.4.24\"],\"elixir_version\":[\"1.13.1\",\"1.12.3\",\"1.11.4\"],\"rebar3_version\":[\"3.16.1\"],\"os\":[\"ubuntu-18.04\"]}" echo "::set-output name=matrix::$matrixStringifiedObject" opentelemetry-ecto: needs: [test-matrix] @@ -55,9 +55,9 @@ jobs: uses: actions/cache@v2 with: path: | - instrumentation/${{ env.app }}/deps - instrumentation/${{ env.app }}/_build - key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles(format('{0}{1}', github.workspace, 'instrumentation/${{ env.app }}/mix.lock')) }} + ~/deps + ~/_build + key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles('**/mix.lock') }} - name: Fetch deps if: steps.deps-cache.outputs.cache-hit != 'true' run: mix deps.get @@ -92,9 +92,9 @@ jobs: uses: actions/cache@v2 with: path: | - instrumentation/${{ env.app }}/deps - instrumentation/${{ env.app }}/_build - key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles(format('{0}{1}', github.workspace, 'instrumentation/${{ env.app }}/mix.lock')) }} + ~/deps + ~/_build + key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles('**/mix.lock') }} - name: Fetch deps if: steps.deps-cache.outputs.cache-hit != 'true' run: mix deps.get @@ -129,9 +129,9 @@ jobs: uses: actions/cache@v2 with: path: | - utilities/${{ env.app }}/deps - utilities/${{ env.app }}/_build - key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles(format('{0}{1}', github.workspace, 'utilities/${{ env.app }}/mix.lock')) }} + ~/deps + ~/_build + key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles('**/mix.lock') }} - name: Fetch deps if: steps.deps-cache.outputs.cache-hit != 'true' run: mix deps.get @@ -175,9 +175,9 @@ jobs: uses: actions/cache@v2 with: path: | - instrumentation/${{ env.app }}/deps - instrumentation/${{ env.app }}/_build - key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles(format('{0}{1}', github.workspace, 'instrumentation/${{ env.app }}/mix.lock')) }} + ~/deps + ~/_build + key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles('**/mix.lock') }} - name: Fetch deps if: steps.deps-cache.outputs.cache-hit != 'true' run: mix deps.get diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml index ff5b1cb..2686795 100644 --- a/.github/workflows/erlang.yml +++ b/.github/workflows/erlang.yml @@ -19,7 +19,7 @@ jobs: - name: Read file id: set-matrix run: | - matrixStringifiedObject="{\"otp_version\":[\"24.0.6\",\"23.3.4.7\",\"22.3.4.21\"],\"rebar3_version\":[\"3.16.1\"],\"os\":[\"ubuntu-18.04\"],\"include\":[{\"otp_version\":\"21.3.8.24\",\"rebar3_version\":\"3.15.2\"}]}" + matrixStringifiedObject="{\"otp_version\":[\"24.2\",\"23.3.4.10\",\"22.3.4.24\"],\"rebar3_version\":[\"3.16.1\"],\"os\":[\"ubuntu-18.04\"]}" echo "::set-output name=matrix::$matrixStringifiedObject" opentelemetry-cowboy: needs: [test-matrix] @@ -44,8 +44,8 @@ jobs: uses: actions/cache@v2 with: path: | - ${{ env.app }}/_build - key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.rebar3_version }}-v3-${{ hashFiles(format('{0}{1}', github.workspace, 'instrumentation/${{ env.app }}/rebar.lock')) }} + ~/_build + key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.rebar3_version }}-v3-${{ hashFiles('**/rebar.lock') }} - name: Fetch deps if: steps.deps-cache.outputs.cache-hit != 'true' run: rebar3 get-deps @@ -75,8 +75,8 @@ jobs: uses: actions/cache@v2 with: path: | - ${{ env.app }}/_build - key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.rebar3_version }}-v3-${{ hashFiles(format('{0}{1}', github.workspace, 'utilities/${{ env.app }}/rebar.lock')) }} + ~/_build + key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.rebar3_version }}-v3-${{ hashFiles('**/rebar.lock') }} - name: Fetch deps if: steps.deps-cache.outputs.cache-hit != 'true' run: rebar3 get-deps