Merge branch 'main' into jkutner/fix-1121-bug

buildpacks · Apr 28, 2021 · 3104129 · 3104129
2 parents 9cc6613 + 5d39613
commit 3104129
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/deliver-ubuntu.yml b/.github/workflows/deliver-ubuntu.yml
@@ -39,7 +39,7 @@ jobs:
 
       steps:
           - name: Determine version
-            uses: actions/github-script@v3
+            uses: actions/github-script@v4.0.2
             id: version
             with:
               result-encoding: string

diff --git a/.github/workflows/delivery-archlinux.yml b/.github/workflows/delivery-archlinux.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Determine version
-        uses: actions/github-script@v3
+        uses: actions/github-script@v4.0.2
         id: version
         with:
           result-encoding: string
@@ -76,7 +76,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Determine version
-        uses: actions/github-script@v3
+        uses: actions/github-script@v4.0.2
         id: version
         with:
           result-encoding: string
@@ -95,7 +95,7 @@ jobs:
           mkdir -p ${{ env.PACKAGE_NAME }}/
           cp .github/workflows/delivery/archlinux/${{ env.PACKAGE_NAME }}/PKGBUILD ${{ env.PACKAGE_NAME }}/PKGBUILD
       - name: Lookup assets
-        uses: actions/github-script@v1
+        uses: actions/github-script@v4.0.2
         id: assets
         with:
           script: |

diff --git a/.github/workflows/delivery-chocolatey.yml b/.github/workflows/delivery-chocolatey.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Determine version
-        uses: actions/github-script@v3
+        uses: actions/github-script@v4.0.2
         id: version
         with:
           result-encoding: string

diff --git a/.github/workflows/delivery-docker.yml b/.github/workflows/delivery-docker.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Determine version
-        uses: actions/github-script@v3
+        uses: actions/github-script@v4.0.2
         id: version
         with:
           result-encoding: string

diff --git a/.github/workflows/delivery-homebrew.yml b/.github/workflows/delivery-homebrew.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Copy pack.rb
         run: cp .github/workflows/delivery/homebrew/pack.rb homebrew-tap/Formula/pack.rb
       - name: Lookup assets
-        uses: actions/github-script@v1
+        uses: actions/github-script@v4.0.2
         id: assets
         with:
           script: |

diff --git a/.github/workflows/privileged-pr-process.yml b/.github/workflows/privileged-pr-process.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Add milestone
-        uses: actions/github-script@v1
+        uses: actions/github-script@v4.0.2
         id: assets
         with:
           script: |

diff --git a/build.go b/build.go
@@ -156,7 +156,7 @@ type BuildOptions struct {
 	// when using an untrusted builder.
 	LifecycleImage string
 
-	// The location at with to mount the AppDir in the build image.
+	// The location at which to mount the AppDir in the build image.
 	Workspace string
 }
 

diff --git a/internal/build/lifecycle_execution.go b/internal/build/lifecycle_execution.go
@@ -90,6 +90,10 @@ func (l *LifecycleExecution) AppPath() string {
 	return l.opts.AppPath
 }
 
+func (l LifecycleExecution) AppDir() string {
+	return l.mountPaths.appDir()
+}
+
 func (l *LifecycleExecution) AppVolume() string {
 	return l.appVolume
 }

diff --git a/internal/build/lifecycle_execution_test.go b/internal/build/lifecycle_execution_test.go
@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"math/rand"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -135,6 +136,7 @@ func testLifecycleExecution(t *testing.T, when spec.G, it spec.S) {
 
 				lifecycle, err := build.NewLifecycleExecution(logger, docker, opts)
 				h.AssertNil(t, err)
+				h.AssertEq(t, filepath.Base(lifecycle.AppDir()), "workspace")
 
 				err = lifecycle.Run(context.Background(), func(execution *build.LifecycleExecution) build.PhaseFactory {
 					return fakePhaseFactory
@@ -198,19 +200,12 @@ func testLifecycleExecution(t *testing.T, when spec.G, it spec.S) {
 
 				lifecycle, err := build.NewLifecycleExecution(logger, docker, opts)
 				h.AssertNil(t, err)
+				h.AssertEq(t, filepath.Base(lifecycle.AppDir()), "app")
 
 				err = lifecycle.Run(context.Background(), func(execution *build.LifecycleExecution) build.PhaseFactory {
 					return fakePhaseFactory
 				})
 				h.AssertNil(t, err)
-
-				h.AssertEq(t, len(fakePhaseFactory.NewCalledWithProvider), 1)
-
-				for _, entry := range fakePhaseFactory.NewCalledWithProvider {
-					if entry.Name() == "creator" {
-						h.AssertSliceContains(t, entry.ContainerConfig().Cmd, "/some/image")
-					}
-				}
 			})
 		})