Merge pull request #254 from wingyplus/ci

Upgrade Elixir and OTP in GitHub Workflow
open-telemetry · Jun 2, 2021 · 896be9c · 896be9c
2 parents f14066e + fb59106
commit 896be9c
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 27 deletions.
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: erlef/setup-elixir@v1
+      - uses: erlef/setup-beam@v1
         with:
-          otp-version: '23.1'
-          elixir-version: '1.11.1'
+          otp-version: '24.0.1'
+          elixir-version: '1.12.1'
       - uses: actions/cache@v2
         name: Cache
         with:
@@ -33,19 +33,29 @@ jobs:
     name: Test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }}) and ${{ matrix.os }}
     strategy:
       matrix:
-        otp_version: ['23.1', '22.3.4.2', '21.3.8.16']
-        elixir: ['1.11.1']
+        otp_version: ['24.0.2', '23.3.4.2', '22.3.4.20']
+        elixir_version: ['1.12.1', '1.11.4']
+        rebar3_version: ['3.16.1']
         os: [ubuntu-18.04]
+        include:
+          - otp_version: '21.3.8.24'
+            elixir_version: '1.11.4'
+            rebar3_version: '3.15.2'
+            os: ubuntu-18.04
+        exclude:
+          - otp_version: '21.3.8.24'
+            elixir_version: '1.12.1'
     env:
       OTP_VERSION: ${{ matrix.otp_version }}
-      ELIXIR_VERSION: ${{ matrix.elixir }}
+      ELIXIR_VERSION: ${{ matrix.elixir_version }}
       OTEL_TRACES_EXPORTER: "none"
     steps:
       - uses: actions/checkout@v2
-      - uses: erlef/setup-elixir@v1
+      - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ matrix.otp_version }}
-          elixir-version: ${{ matrix.elixir }}
+          elixir-version: ${{ matrix.elixir_version }}
+          rebar3-version: ${{ matrix.rebar3_version }}
       - name: Compile
         run: rebar3 as test compile
       - name: ExUnit
@@ -56,30 +66,40 @@ jobs:
     name: Test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }}) and ${{ matrix.os }}
     strategy:
       matrix:
-        otp_version: ['23.1', '22.3.4.2', '21.3.8.16']
-        elixir: ['1.11.1']
+        otp_version: ['24.0.2', '23.3.4.2', '22.3.4.20']
+        elixir_version: ['1.12.1', '1.11.4']
+        rebar3_version: ['3.16.1']
         os: [ubuntu-18.04]
+        include:
+          - otp_version: '21.3.8.24'
+            elixir_version: '1.11.4'
+            rebar3_version: '3.15.2'
+            os: ubuntu-18.04
+        exclude:
+          - otp_version: '21.3.8.24'
+            elixir_version: '1.12.1'
     env:
       OTP_VERSION: ${{ matrix.otp_version }}
-      ELIXIR_VERSION: ${{ matrix.elixir }}
+      ELIXIR_VERSION: ${{ matrix.elixir_version }}
     defaults:
       run:
         working-directory: apps/opentelemetry_api/
     steps:
       - uses: actions/checkout@v2
-      - uses: erlef/setup-elixir@v1
+      - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ matrix.otp_version }}
-          elixir-version: ${{ matrix.elixir }}
+          elixir-version: ${{ matrix.elixir_version }}
+          rebar3-version: ${{ matrix.rebar3_version }}
       - uses: actions/cache@v2
         name: Cache
         with:
           path: |
             apps/opentelemetry_api/deps
             apps/opentelemetry_api/_build
-          key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir }}-v3-${{ hashFiles(format('{0}{1}', github.workspace, '/apps/opentelemetry_api/mix.lock')) }}
+          key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles(format('{0}{1}', github.workspace, '/apps/opentelemetry_api/mix.lock')) }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir }}-
+            ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-
       - run: mix deps.get
         name: Deps
       - run: mix test --cover
@@ -96,30 +116,30 @@ jobs:
     name: Dialyze on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }}) and ${{ matrix.os }}
     strategy:
       matrix:
-        otp_version: ['23.1']
-        elixir: ['1.11.1']
+        otp_version: ['24.0.2']
+        elixir_version: ['1.12.1']
         os: [ubuntu-18.04]
     env:
       OTP_VERSION: ${{ matrix.otp_version }}
-      ELIXIR_VERSION: ${{ matrix.elixir }}
+      ELIXIR_VERSION: ${{ matrix.elixir_version }}
     defaults:
       run:
         working-directory: apps/opentelemetry_api/
     steps:
       - uses: actions/checkout@v2
-      - uses: erlef/setup-elixir@v1
+      - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ matrix.otp_version }}
-          elixir-version: ${{ matrix.elixir }}
+          elixir-version: ${{ matrix.elixir_version }}
       - uses: actions/cache@v2
         name: Cache
         with:
           path: |
             apps/opentelemetry_api/deps
             apps/opentelemetry_api/_build
-          key: ${{ runner.os }}-dialyzer-${{ matrix.otp_version }}-${{ matrix.elixir }}-v3-${{ hashFiles('apps/opentelemetry_api/mix.lock') }}
+          key: ${{ runner.os }}-dialyzer-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-v3-${{ hashFiles('apps/opentelemetry_api/mix.lock') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir }}-
+            ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ matrix.elixir_version }}-
       - run: mix deps.get
         name: Deps
       - run: mix dialyzer

diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -14,18 +14,24 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        otp_version: ['23.0.2', '22.3.4.2', '21.3.8.16']
+        otp_version: ['24.0.2', '23.3.4.2', '22.3.4.20']
+        rebar3_version: ['3.16.1']
         os: [ubuntu-18.04]
+        include:
+          - otp_version: '21.3.8.24'
+            rebar3_version: '3.15.2'
+            os: ubuntu-18.04
     env:
       OTP_VERSION: ${{ matrix.otp_version }}
       OTEL_TRACES_EXPORTER: "none"
     steps:
     - uses: actions/checkout@v2
     - name: Run Collector
       run: docker-compose up -d
-    - uses: erlef/setup-elixir@v1
+    - uses: erlef/setup-beam@v1
       with:
         otp-version: ${{ matrix.otp_version }}
+        rebar3-version: ${{ matrix.rebar3_version }}
         elixir-version: '1.11.1'
     - uses: actions/cache@v2
       name: Cache
@@ -69,14 +75,19 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        otp_version: ['23.0.2', '22.3.4.2', '21.3.8.16']
+        otp_version: ['24.0.2', '23.3.4.2', '22.3.4.20']
+        rebar3_version: ['3.16.1']
         os: [ubuntu-18.04]
+        include:
+          - otp_version: '21.3.8.24'
+            rebar3_version: '3.15.2'
+            os: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
-    - uses: erlef/setup-elixir@v1
+    - uses: erlef/setup-beam@v1
       with:
         otp-version: ${{ matrix.otp_version }}
-        elixir-version: '1.11.1'
+        rebar3-version: ${{ matrix.rebar3_version }}
     - uses: actions/cache@v2
       name: Cache
       with: