From 7eec423c24f6b8e1ac99a98b3de8bd71584b2694 Mon Sep 17 00:00:00 2001
From: Carlos Roman <carlos.roman@datadoghq.com>
Date: Tue, 28 Jun 2022 10:51:16 +0100
Subject: [PATCH] Adding Go 1.18 and dropping older versions

---
 .circleci/config.yml              | 10 +++++++---
 .github/workflows/datadog-go.yaml | 21 +++++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be8a7102a..bd7ff0fa3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,3 +1,4 @@
+---
 # We use github actions to test the code on windows and linux amd64. Circleci is used for linux arm64.
 #
 version: 2.1
@@ -9,7 +10,7 @@ executors:
   linux_arm64:
     description: "arm64"
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:2022.04.1
     resource_class: arm.medium
 
 commands:
@@ -18,7 +19,7 @@ commands:
       version:
         type: string
     steps:
-      - os-detect/init # this setup the '$SUDO' variable
+      - os-detect/init  # this setup the '$SUDO' variable
       - run:
           name: "install Golang linux"
           command: |
@@ -72,4 +73,7 @@ workflows:
       - tests_arm64:
           matrix:
             parameters:
-              go-version: ["1.13", "1.14", "1.15", "1.16", "1.17"]
+              go-version:
+                - "1.16"
+                - "1.17"
+                - "1.18"
diff --git a/.github/workflows/datadog-go.yaml b/.github/workflows/datadog-go.yaml
index 8fb3e4b00..ea65d0d14 100644
--- a/.github/workflows/datadog-go.yaml
+++ b/.github/workflows/datadog-go.yaml
@@ -1,16 +1,25 @@
-# We use github actions to test the code on windows and linux amd64. Circleci is used for linux arm64.
-
+---
+# We use github actions to test the code on windows and linux amd64.
+# Circleci is used for linux arm64.
+#
 name: datadog-go
 on:
-  pull_request:
+  - push
+  - pull_request
 
 jobs:
   native:
     strategy:
       matrix:
-        go-version: [ 1.17, 1.16, 1.15, 1.14, 1.13]
-        runs-on: [ ubuntu-latest, windows-latest, macos-latest ]
-      fail-fast: false
+        go-version:
+          - 1.16
+          - 1.17
+          - 1.18
+        runs-on:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+      fail-fast: true
     runs-on: ${{ matrix.runs-on }}
     steps:
       - name: Setup go