Add go1.18 support; set go1.18 in Dockerfile (#196)

* add go1.18 support; set go1.18 in Dockerfile * Test to trigger CI run Co-authored-by: Habib Pagarkar <[email protected]>
fullstorydev · Aug 4, 2022 · 410c0c3 · 410c0c3
1 parent 347dfad
commit 410c0c3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,6 +5,12 @@ shared_configs:
         name: Run tests
         command: |
           make deps test
+  full_job_steps: &full_job_steps
+    - checkout
+    - run:
+        name: Run tests
+        command: |
+          make ci
 
 
 # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
@@ -13,38 +19,25 @@ jobs:
   build-1-15:
     working_directory: ~/repo
     docker:
-      - image: circleci/golang:1.15
+      - image: cimg/go:1.15
     steps: *simple_job_steps
 
   build-1-16:
     working_directory: ~/repo
     docker:
-      - image: circleci/golang:1.16
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - go-mod-v4-{{ checksum "go.sum" }}
-      - run:
-          name: Install Dependencies
-          command: go mod download
-      - save_cache:
-          key: go-mod-v4-{{ checksum "go.sum" }}
-          paths:
-            - "/go/pkg/mod"
-      - run:
-          name: Run tests
-          command: |
-            #mkdir -p /tmp/test-reports
-            #gotestsum --junitfile /tmp/test-reports/unit-tests.xml
-            make ci
-    #- store_test_results:
-    #    path: /tmp/test-reports
+      - image: cimg/go:1.16
+    steps: *full_job_steps
 
   build-1-17:
     working_directory: ~/repo
     docker:
-      - image: circleci/golang:1.17
+      - image: cimg/go:1.17
+    steps: *simple_job_steps
+
+  build-1-18:
+    working_directory: ~/repo
+    docker:
+      - image: cimg/go:1.18
     steps: *simple_job_steps
 
 workflows:
@@ -53,3 +46,4 @@ workflows:
       - build-1-15
       - build-1-16
       - build-1-17
+      - build-1-18
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine as builder
+FROM golang:1.18-alpine as builder
 MAINTAINER FullStory Engineering
 
 # create non-privileged group and user

diff --git a/README.md b/README.md
@@ -250,3 +250,4 @@ protoc --proto_path=. \
 The `--descriptor_set_out` argument is what tells `protoc` to produce a protoset,
 and the `--include_imports` argument is necessary for the protoset to contain
 everything that `grpcui` needs to process and understand the schema.
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -250,3 +250,4 @@ protoc --proto_path=. \
		The `--descriptor_set_out` argument is what tells `protoc` to produce a protoset,
		and the `--include_imports` argument is necessary for the protoset to contain
		everything that `grpcui` needs to process and understand the schema.