mirror of
https://github.com/github/codeql.git
synced 2026-01-29 14:23:03 +01:00
Merge pull request #219 from max/new-env-vars
Teach extractor about CodeQL environment variables.
This commit is contained in:
@@ -6,9 +6,6 @@ pull_request_triggers:
|
||||
- "**/glide.yaml"
|
||||
- "**/Gopkg.toml"
|
||||
column_kind: "utf8"
|
||||
extra_env_vars:
|
||||
SOURCE_ARCHIVE: ${env.CODEQL_EXTRACTOR_GO_SOURCE_ARCHIVE_DIR}
|
||||
TRAP_FOLDER: ${env.CODEQL_EXTRACTOR_GO_TRAP_DIR}
|
||||
file_types:
|
||||
- name: go
|
||||
display_name: Go
|
||||
|
||||
@@ -55,9 +55,12 @@ func Add(path string) error {
|
||||
}
|
||||
|
||||
func srcArchive() (string, error) {
|
||||
srcArchive := os.Getenv("SOURCE_ARCHIVE")
|
||||
srcArchive := os.Getenv("CODEQL_EXTRACTOR_GO_SOURCE_ARCHIVE_DIR")
|
||||
if srcArchive == "" {
|
||||
return "", errors.New("environment variable SOURCE_ARCHIVE not set")
|
||||
srcArchive = os.Getenv("SOURCE_ARCHIVE")
|
||||
}
|
||||
if srcArchive == "" {
|
||||
return "", errors.New("environment variable CODEQL_EXTRACTOR_GO_SOURCE_ARCHIVE_DIR not set")
|
||||
}
|
||||
err := os.MkdirAll(srcArchive, 0755)
|
||||
if err != nil {
|
||||
|
||||
@@ -51,9 +51,12 @@ func NewWriter(path string, pkg *packages.Package) (*Writer, error) {
|
||||
}
|
||||
|
||||
func trapFolder() (string, error) {
|
||||
trapFolder := os.Getenv("TRAP_FOLDER")
|
||||
trapFolder := os.Getenv("CODEQL_EXTRACTOR_GO_TRAP_DIR")
|
||||
if trapFolder == "" {
|
||||
return "", errors.New("environment variable TRAP_FOLDER not set")
|
||||
trapFolder = os.Getenv("TRAP_FOLDER")
|
||||
}
|
||||
if trapFolder == "" {
|
||||
return "", errors.New("environment variable CODEQL_EXTRACTOR_GO_TRAP_DIR not set")
|
||||
}
|
||||
err := os.MkdirAll(trapFolder, 0755)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user