Remove GOPATH

xxx Signed-off-by: Kazuyoshi Kato <[email protected]>
containerd · Aug 12, 2023 · 714ce84 · 714ce84
1 parent 7e123b2
commit 714ce84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,6 @@ jobs:
     - name: Setup environment
       shell: bash
       run: |
-        echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
         echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
 
     - name: Check out code
@@ -69,7 +68,6 @@ jobs:
     - name: Setup environment
       shell: bash
       run: |
-        echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
         echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
 
     - name: Check out code
@@ -118,7 +116,6 @@ jobs:
     - name: Setup environment
       shell: bash
       run: |
-        echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
         echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
 
     - name: Check out code

diff --git a/main.go b/main.go
@@ -194,11 +194,11 @@ func main() {
 			includes = append(includes, gopathJoin(gopath, pkg))
 		}
 
-		includes = append(includes, gopath)
+		includes = append(includes, pkg.Dir)
 		includes = append(includes, c.Includes.After...)
 
 		protoc := protocCmd{
-			Generators: generators(c.Generators, outputDir),
+			Generators: generators(c.Generators, pkg.Dir),
 			Files:      pkg.ProtoFiles,
 			OutputDir:  outputDir,
 			Includes:   includes,
@@ -246,7 +246,7 @@ func main() {
 		}
 
 		var (
-			genDescriptors = shouldGenerateDescriptors(importDirPath)
+			genDescriptors = shouldGenerateDescriptors(pkg.GoImportPath)
 			dfp            *os.File // tempfile for descriptors
 		)