From 0d2c43f52e8581f5a7c8a04064cff801145ee529 Mon Sep 17 00:00:00 2001 From: Christian Banse Date: Wed, 8 Jan 2025 21:12:40 +0100 Subject: [PATCH] Re-enable go for Go integration test --- .github/workflows/build.yml | 4 ++++ cpg-language-go/src/test/resources/golang/buildtags/go.mod | 3 --- .../golang/{buildtags => integration}/cmd/buildtags/main.go | 0 .../golang/{buildtags => integration}/func_darwin.go | 0 .../golang/{buildtags => integration}/func_darwin_arm64.go | 0 .../resources/golang/{buildtags => integration}/func_ios.go | 0 .../golang/{buildtags => integration}/func_linux_arm64.go | 0 cpg-language-go/src/test/resources/golang/integration/go.mod | 3 +++ 8 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 cpg-language-go/src/test/resources/golang/buildtags/go.mod rename cpg-language-go/src/test/resources/golang/{buildtags => integration}/cmd/buildtags/main.go (100%) rename cpg-language-go/src/test/resources/golang/{buildtags => integration}/func_darwin.go (100%) rename cpg-language-go/src/test/resources/golang/{buildtags => integration}/func_darwin_arm64.go (100%) rename cpg-language-go/src/test/resources/golang/{buildtags => integration}/func_ios.go (100%) rename cpg-language-go/src/test/resources/golang/{buildtags => integration}/func_linux_arm64.go (100%) create mode 100644 cpg-language-go/src/test/resources/golang/integration/go.mod diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15080ffd813..e7465d2fefb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,10 @@ jobs: - uses: actions/setup-node@v4 with: node-version: "18" + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version-file: cpg-language-go/src/test/resources/golang/integration/go.mod - name: Setup neo4j run: | docker run -d --env NEO4J_AUTH=neo4j/password -p7474:7474 -p7687:7687 -e NEO4JLABS_PLUGINS='["apoc"]' neo4j:5 || true diff --git a/cpg-language-go/src/test/resources/golang/buildtags/go.mod b/cpg-language-go/src/test/resources/golang/buildtags/go.mod deleted file mode 100644 index 7f87cd2ed5b..00000000000 --- a/cpg-language-go/src/test/resources/golang/buildtags/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module mymodule.io/buildtags - -go 1.21.1 diff --git a/cpg-language-go/src/test/resources/golang/buildtags/cmd/buildtags/main.go b/cpg-language-go/src/test/resources/golang/integration/cmd/buildtags/main.go similarity index 100% rename from cpg-language-go/src/test/resources/golang/buildtags/cmd/buildtags/main.go rename to cpg-language-go/src/test/resources/golang/integration/cmd/buildtags/main.go diff --git a/cpg-language-go/src/test/resources/golang/buildtags/func_darwin.go b/cpg-language-go/src/test/resources/golang/integration/func_darwin.go similarity index 100% rename from cpg-language-go/src/test/resources/golang/buildtags/func_darwin.go rename to cpg-language-go/src/test/resources/golang/integration/func_darwin.go diff --git a/cpg-language-go/src/test/resources/golang/buildtags/func_darwin_arm64.go b/cpg-language-go/src/test/resources/golang/integration/func_darwin_arm64.go similarity index 100% rename from cpg-language-go/src/test/resources/golang/buildtags/func_darwin_arm64.go rename to cpg-language-go/src/test/resources/golang/integration/func_darwin_arm64.go diff --git a/cpg-language-go/src/test/resources/golang/buildtags/func_ios.go b/cpg-language-go/src/test/resources/golang/integration/func_ios.go similarity index 100% rename from cpg-language-go/src/test/resources/golang/buildtags/func_ios.go rename to cpg-language-go/src/test/resources/golang/integration/func_ios.go diff --git a/cpg-language-go/src/test/resources/golang/buildtags/func_linux_arm64.go b/cpg-language-go/src/test/resources/golang/integration/func_linux_arm64.go similarity index 100% rename from cpg-language-go/src/test/resources/golang/buildtags/func_linux_arm64.go rename to cpg-language-go/src/test/resources/golang/integration/func_linux_arm64.go diff --git a/cpg-language-go/src/test/resources/golang/integration/go.mod b/cpg-language-go/src/test/resources/golang/integration/go.mod new file mode 100644 index 00000000000..51d26cb85fc --- /dev/null +++ b/cpg-language-go/src/test/resources/golang/integration/go.mod @@ -0,0 +1,3 @@ +module mymodule.io/integration + +go 1.21.1