rm 16 17 support

grafana · May 24, 2024 · 9f94b26 · 9f94b26
1 parent ed47413
commit 9f94b26
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 22 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.16', '1.17', '1.18', '1.19', '1.20', '1.21', '1.22', 'tip']
+        go: ['1.18', '1.19', '1.20', '1.21', '1.22', 'tip']
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -21,11 +21,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
-      - name: Downgrade go.mod for go 1.17 and go 1.16
-        if:  matrix.go == '1.17' || matrix.go == '1.16'
-        run: make go/mod_16_for_testing
       - name: Run go/mod
-        if:  matrix.go != '1.17' && matrix.go != '1.16'
         run: make go/mod && git diff --exit-code
       - name: Install Go stable
         if: matrix.go == 'tip'

diff --git a/Makefile b/Makefile
@@ -15,8 +15,3 @@ go/mod:
 	cd godeltaprof/  && GO111MODULE=on go mod download
 	cd godeltaprof/ && GO111MODULE=on go mod tidy
 
-.PHONY: go/mod_16_for_testing
-go/mod_16_for_testing:
-	rm -rf godeltaprof/compat/go.mod godeltaprof/compat/go.sum godeltaprof/go.mod godeltaprof/go.sum go.work otelpyroscope/
-	cat go.mod_go16_test.txt > go.mod
-	go mod tidy
diff --git a/go.mod_go16_test.txt b/go.mod_go16_test.txt