Revert "attempt adding a GPL go pkg"

sreya · sreya · commit 6d7a0dc9ddc8 · 2024-04-16T23:49:03.000Z
This reverts commit 58e39ee.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -899,21 +899,22 @@ jobs:
         run: |
           make sqlc-vet
 
-  # dependency-license-review checks that no license-incompatible dependencies have been introduced.
+  # dependency-license-review checks that no license-incompatible dependencies have been introduced. 
   # This action is not intended to do a vulnerability check since that is handled by a separate action.
   dependency-license-review:
     runs-on: ubuntu-latest
     steps:
-      - name: "Checkout Repository"
+      - name: 'Checkout Repository'
         uses: actions/checkout@v4
-      - name: "Dependency Review"
+      - name: 'Dependency Review'
         id: review
         uses: actions/dependency-review-action@v4
         with:
-          allow-licenses: Apache-2.0, BSD-2-Clause, BSD-3-Clause, CC0-1.0, ISC #, MIT, MIT-0, MPL-2.0
+          #allow-licenses: Apache-2.0, BSD-2-Clause, BSD-3-Clause, CC0-1.0, ISC, MIT, MIT-0, MPL-2.0
+          allow-licenses: BSD-2-Clause, BSD-3-Clause, CC0-1.0, ISC, MIT, MIT-0, MPL-2.0
           license-check: true
           vulnerability-check: false
-      - name: "Report"
+      - name: 'Report'
         # make sure this step runs even if the previous failed
         if: ${{ failure() && steps.review.conclusion == 'failure' }}
         shell: bash
diff --git a/cmd/coder/main.go b/cmd/coder/main.go
@@ -4,8 +4,6 @@ import (
 	_ "time/tzdata"
 
 	"github.com/coder/coder/v2/cli"
-
-	_ "github.com/basgys/go-gpl/gpl"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
@@ -215,7 +215,6 @@ require (
 require go.uber.org/mock v0.4.0
 
 require (
-	github.com/basgys/go-gpl v0.0.0-20230209111130-4e0087feed95
 	github.com/benbjohnson/clock v1.3.5
 	github.com/coder/serpent v0.7.0
 	github.com/gomarkdown/markdown v0.0.0-20231222211730-1d6d20845b47
diff --git a/go.sum b/go.sum
@@ -124,8 +124,6 @@ github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiE
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
-github.com/basgys/go-gpl v0.0.0-20230209111130-4e0087feed95 h1:K9X3r6eO+Fa1sbcoyWEz5s6R6z3GlpIe9KC5qfcTUX4=
-github.com/basgys/go-gpl v0.0.0-20230209111130-4e0087feed95/go.mod h1:XY/3nkvH5NfeP5X7QNqbwhdXwwD6TCA+NgUHI+UrUPY=
 github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
 github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ import (`
`4`	`4`	`_ "time/tzdata"`
`5`	`5`
`6`	`6`	`"github.com/coder/coder/v2/cli"`
`7`		`-`
`8`		`- _ "github.com/basgys/go-gpl/gpl"`
`9`	`7`	`)`
`10`	`8`
`11`	`9`	`func main() {`