Merge branch 'main' into automation/go-mod-update/update-main

.github/workflows/test-pull-request.yml

@@ -26,6 +26,8 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Run Unit Tests
+      env:
+        GO_TEST_PARAMS: -count=5
       run: ./scripts/unit.sh
 
     - name: Get builders from integration.json

build.go

@@ -88,7 +88,9 @@ func Build(buildProcess BuildProcess, logs scribe.Emitter, clock chronos.Clock,
 		}
 
 		if exists {
-			layers = append(layers, modCacheLayer)
+			if !fs.IsEmptyDir(modCacheLayer.Path) {
+				layers = append(layers, modCacheLayer)
+			}
 		}
 
 		return packit.BuildResult{

build_test.go

@@ -54,6 +54,8 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		err = os.MkdirAll(filepath.Join(layersDir, "mod-cache"), os.ModePerm)
 		Expect(err).NotTo(HaveOccurred())
 
+		Expect(os.WriteFile(filepath.Join(filepath.Join(layersDir, "mod-cache"), "cache"), nil, os.ModePerm))
+
 		now := time.Now()
 		clock = chronos.NewClock(func() time.Time {
 			return now
@@ -174,6 +176,27 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		})
 	})
 
+	context("when the mod cache layer is empty", func() {
+		it.Before(func() {
+			err := os.RemoveAll(filepath.Join(layersDir, "mod-cache", "cache"))
+			Expect(err).NotTo(HaveOccurred())
+		})
+
+		it("does not include the module cache layer in the build result", func() {
+			result, err := build(packit.BuildContext{
+				Layers:     packit.Layers{Path: layersDir},
+				WorkingDir: workingDir,
+				BuildpackInfo: packit.BuildpackInfo{
+					Name:    "Some Buildpack",
+					Version: "some-version",
+				},
+			})
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(result.Layers).To(BeEmpty())
+		})
+	})
+
 	context("failure cases", func() {
 		context("build process fails to check if it should run", func() {
 			it.Before(func() {

integration/init_test.go

@@ -82,7 +82,6 @@ func TestIntegration(t *testing.T) {
 
 	suite := spec.New("Integration", spec.Report(report.Terminal{}), spec.Parallel())
 	suite("Default", testDefault)
-	suite("EmptyCache", testEmptyCache)
 	suite("Vendored", testVendored)
 	suite.Run(t)
 }

integration/testdata/default/go.mod

@@ -1,6 +1,6 @@
 module default
 
-go 1.14
+go 1.23
 
 require (
 	github.com/BurntSushi/toml v0.3.1

integration/testdata/default/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	_ "embed"
 	"fmt"
 	"log"
 	"net/http"
@@ -14,6 +15,7 @@ type Config struct {
 	Age int
 }
 
+//go:embed .occam-key
 func main() {
 	var conf Config
 	if _, err := toml.Decode("whatever", &conf); err != nil {

integration/testdata/vendored/go.mod

@@ -1,6 +1,6 @@
 module default
 
-go 1.14
+go 1.23
 
 require (
 	github.com/BurntSushi/toml v0.3.1

scripts/.util/tools.json

@@ -1,5 +1,5 @@
 {
-  "createpackage": "v1.70.0",
-  "jam": "v2.8.0",
-  "pack": "v0.34.2"
+  "createpackage": "v1.71.0",
+  "jam": "v2.9.0",
+  "pack": "v0.35.1"
 }

scripts/unit.sh

@@ -6,6 +6,8 @@ set -o pipefail
 readonly PROGDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 readonly BUILDPACKDIR="$(cd "${PROGDIR}/.." && pwd)"
 
+GO_TEST_PARAMS="${GO_TEST_PARAMS:-}"
+
 # shellcheck source=SCRIPTDIR/.util/tools.sh
 source "${PROGDIR}/.util/tools.sh"
 
@@ -50,7 +52,7 @@ function unit::run() {
 
   testout=$(mktemp)
   pushd "${BUILDPACKDIR}" > /dev/null
-    if go test ./... -v -run Unit | tee "${testout}"; then
+    if go test ./... -v ${GO_TEST_PARAMS} -run Unit | tee "${testout}"; then
       util::tools::tests::checkfocus "${testout}"
       util::print::success "** GO Test Succeeded **"
     else