Skip to content

Commit d3bcd4e

Browse files
paketo-botpacostas
andauthored
Updates github-config (#70)
* Updating github-config * Updating github-config * Updating github-config * fix: removing the removal of the lifecycle from the docker daemon * Update scripts/.util/tools.json * Updating github-config --------- Co-authored-by: Costas Papastathis <papastathiscr@gmail.com>
1 parent 518b814 commit d3bcd4e

File tree

5 files changed

+5
-56
lines changed

5 files changed

+5
-56
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
runs-on: ubuntu-24.04
9090
steps:
9191
- name: Setup Go
92-
uses: actions/setup-go@v5
92+
uses: actions/setup-go@v6
9393
with:
9494
go-version: stable
9595

buildpack_integration_base_stack_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ func testBuildpackIntegrationBaseStack(t *testing.T, context spec.G, it spec.S)
8787
Expect(docker.Image.Remove.Execute(image.ID)).To(Succeed())
8888
Expect(docker.Volume.Remove.Execute(occam.CacheVolumeNames(name))).To(Succeed())
8989

90-
_, err := getLifecycleVersion(builder)
91-
Expect(err).NotTo(HaveOccurred())
92-
9390
Expect(docker.Image.Remove.Execute(builder)).To(Succeed())
9491
Expect(os.RemoveAll(builderConfigFilepath)).To(Succeed())
9592

buildpack_integration_tiny_stack_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ func testBuildpackIntegrationTinyStack(t *testing.T, context spec.G, it spec.S)
7878
Expect(docker.Image.Remove.Execute(image.ID)).To(Succeed())
7979
Expect(docker.Volume.Remove.Execute(occam.CacheVolumeNames(name))).To(Succeed())
8080

81-
_, err := getLifecycleVersion(builder)
82-
Expect(err).NotTo(HaveOccurred())
83-
8481
Expect(docker.Image.Remove.Execute(builder)).To(Succeed())
8582
Expect(os.RemoveAll(builderConfigFilepath)).To(Succeed())
8683

init_test.go

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package acceptance_test
22

33
import (
44
"bytes"
5-
"encoding/json"
65
"fmt"
76
"os"
87
"path/filepath"
@@ -11,22 +10,13 @@ import (
1110

1211
"github.com/google/uuid"
1312
"github.com/onsi/gomega/format"
14-
"github.com/paketo-buildpacks/occam"
1513
"github.com/paketo-buildpacks/packit/v2/pexec"
1614
"github.com/sclevine/spec"
1715
"github.com/sclevine/spec/report"
1816

1917
. "github.com/onsi/gomega"
2018
)
2119

22-
type Builder struct {
23-
LocalInfo struct {
24-
Lifecycle struct {
25-
Version string `json:"version"`
26-
} `json:"lifecycle"`
27-
} `json:"local_info"`
28-
}
29-
3020
var tinyStack struct {
3121
BuildArchive string
3222
RunArchive string
@@ -50,12 +40,9 @@ var staticStack struct {
5040

5141
var RegistryUrl string
5242

53-
var lifecycleVersion string
54-
5543
func by(_ string, f func()) { f() }
5644

5745
func TestAcceptance(t *testing.T) {
58-
docker := occam.NewDocker()
5946

6047
format.MaxLength = 0
6148
SetDefaultEventuallyTimeout(30 * time.Second)
@@ -87,9 +74,6 @@ func TestAcceptance(t *testing.T) {
8774
suite("BuildpackIntegrationTinyStack", testBuildpackIntegrationTinyStack)
8875
suite("BuildpackIntegrationBaseStack", testBuildpackIntegrationBaseStack)
8976
suite.Run(t)
90-
91-
Expect(docker.Image.Remove.Execute(fmt.Sprintf("buildpacksio/lifecycle:%s", lifecycleVersion))).To(Succeed())
92-
9377
}
9478

9579
func createBuilder(config string, name string) (string, error) {
@@ -108,32 +92,3 @@ func createBuilder(config string, name string) (string, error) {
10892
})
10993
return buf.String(), err
11094
}
111-
112-
func getLifecycleVersion(builderID string) (string, error) {
113-
buf := bytes.NewBuffer(nil)
114-
pack := pexec.NewExecutable("pack")
115-
err := pack.Execute(pexec.Execution{
116-
Stdout: buf,
117-
Stderr: buf,
118-
Args: []string{
119-
"builder",
120-
"inspect",
121-
builderID,
122-
"-o",
123-
"json",
124-
},
125-
})
126-
127-
if err != nil {
128-
return "", err
129-
}
130-
131-
var builder Builder
132-
err = json.Unmarshal(buf.Bytes(), &builder)
133-
if err != nil {
134-
return "", err
135-
}
136-
137-
lifecycleVersion = builder.LocalInfo.Lifecycle.Version
138-
return builder.LocalInfo.Lifecycle.Version, nil
139-
}

scripts/.util/tools.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"crane": "v0.20.7",
3-
"jam": "v2.15.2",
4-
"pack": "v0.38.2",
5-
"syft": "v1.40.1"
2+
"crane": "v0.21.0",
3+
"jam": "v2.15.3",
4+
"pack": "v0.40.0",
5+
"syft": "v1.42.1"
66
}

0 commit comments

Comments
 (0)