From bfea5cdaa1ab98d40a4c0b849810c5c8ceaf905c Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Sep 2021 07:55:09 -0600
Subject: [PATCH 1/3] update github actions to use erlef/setup-beam

---
 .github/workflows/main.yml | 41 +++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7bc407b..a1abc43 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,12 @@
 name: OpenTelemetry Zipkin Tests
 
-on: [push]
+on:
+  pull_request:
+    branches:
+      - 'master'
+  push:
+    branches:
+      - 'master'
 
 jobs:
   build:
@@ -15,15 +21,32 @@ jobs:
 
     strategy:
       matrix:
-        otp_version: [21, 22]
-        os: [ubuntu-latest]
-
-    container:
-      image: erlang:${{ matrix.otp_version }}
-
+        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@v1
+    - uses: actions/checkout@v2
+    - 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
+      with:
+        path: |
+          _build
+        key: ${{ runner.os }}-build-${{ matrix.otp_version }}-${{ hashFiles(format('rebar.lock')) }}-2
+        restore-keys: |
+          ${{ runner.os }}-build-${{ matrix.otp_version }}-2-
     - name: Compile
       run: rebar3 compile
-    - name: Run tests
+    - name: Common Test tests
       run: rebar3 ct

From 7e862c79b5dad1402365f93cc22ef37d77307c49 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Sep 2021 08:03:28 -0600
Subject: [PATCH 2/3] use docker-compose in steps to start zipkin

---
 .github/workflows/main.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a1abc43..6252a78 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,13 +12,6 @@ jobs:
   build:
     name: Test on OTP ${{ matrix.otp_version }} and ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-
-    services:
-      zipkin:
-        image: openzipkin/zipkin-slim
-        ports:
-        - 9411:9411
-
     strategy:
       matrix:
         otp_version: ['24.0.2', '23.3.4.2', '22.3.4.20']
@@ -33,6 +26,8 @@ jobs:
       OTEL_TRACES_EXPORTER: "none"
     steps:
     - uses: actions/checkout@v2
+    - name: Run Zipkin
+      run: docker-compose up -d
     - uses: erlef/setup-beam@v1
       with:
         otp-version: ${{ matrix.otp_version }}

From e29e95682a9f97735a81558706ea6d33654434b1 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Sep 2021 10:42:14 -0600
Subject: [PATCH 3/3] Update .github/workflows/main.yml

Co-authored-by: Sasha Gerrand <sgerrand@users.noreply.github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6252a78..69fbb6d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        otp_version: ['24.0.2', '23.3.4.2', '22.3.4.20']
+        otp_version: ['24.0.6', '23.3.4.7', '22.3.4.21']
         rebar3_version: ['3.16.1']
         os: [ubuntu-18.04]
         include: