Skip to content

Commit

Permalink
Merge branch 'mountpoints' of github.com:BarDweller/pack into mountpo…
Browse files Browse the repository at this point in the history
…ints
  • Loading branch information
BarDweller committed Apr 19, 2024
2 parents d42bf65 + d990913 commit d51a4ac
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
- name: Set up go env
run: |
echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- name: Set up go env for Unix
if: runner.os != 'Windows'
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- name: Set up go env
run: |
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ install-golangci-lint:

## mod-tidy: Tidy Go modules
mod-tidy:
$(GOCMD) mod tidy -compat=1.21
cd tools && $(GOCMD) mod tidy -compat=1.21
$(GOCMD) mod tidy -compat=1.22
cd tools && $(GOCMD) mod tidy -compat=1.22

## tidy: Tidy modules and format the code
tidy: mod-tidy format
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,4 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
)

go 1.21
go 1.22
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/buildpacks/pack/tools

go 1.21
go 1.22

require (
github.com/golang/mock v1.6.0
Expand Down

0 comments on commit d51a4ac

Please sign in to comment.