Skip to content

Commit 0a77deb

Browse files
authored
Merge pull request cds-hooks#503 from buildpacks/fix/ci-pack-output
CI: Fix pipelines regarding changes to lifecycle output
2 parents c769e2e + bc4f45b commit 0a77deb

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,12 @@ install-pack-cli: upgrade-pack
8282
else \
8383
echo "pack already installed at $(PACK_BIN)"; \
8484
fi
85-
@echo "pack version: $(shell pack --version)"
85+
@echo "pack version: " `pack --version`
8686

8787
.PHONY: check-pack-cli-version
88-
check-pack-cli-version: export INSTALLED_VERSION:=$(shell pack --version | cut -d '+' -f 1)
8988
check-pack-cli-version:
90-
@echo "> Installed pack version: $(INSTALLED_VERSION)"
91-
@if [ "$(INSTALLED_VERSION)" != "$(PACK_VERSION)" ]; then \
89+
@echo "> Installed pack version: " `pack --version | cut -d '+' -f 1`
90+
@if [ `pack --version | cut -d '+' -f 1` != "$(PACK_VERSION)" ]; then \
9291
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
9392
echo "WARNING: Expected pack version: $(PACK_VERSION)"; \
9493
echo "You may need to upgrade your version of pack! "; \

content/docs/buildpack-author-guide/create-buildpack/build-app.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ pack build test-ruby-app --path ./ruby-sample-app --buildpack ./ruby-buildpack
126126

127127
You will see the following output:
128128

129-
<!-- test:assert=contains;ignore-lines=... -->
130129
```
131130
===> DETECTING
132131
...

content/docs/buildpack-author-guide/create-buildpack/detection.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ pack build test-ruby-app --path ./ruby-sample-app --buildpack ./ruby-buildpack
3737

3838
You should see the following output:
3939

40-
<!-- test:assert=contains -->
4140
```
4241
Previous image with name "test-ruby-app" not found
4342
===> DETECTING
@@ -46,7 +45,7 @@ examples/ruby 0.0.1
4645
===> BUILDING
4746
---> Ruby Buildpack
4847
ERROR: failed to build: exit status 1
49-
ERROR: failed to build: executing lifecycle
48+
ERROR: failed to build: executing lifecycle: failed with status code: 51
5049
```
5150

5251
Notice that `detect` now passes because there is a valid `Gemfile` in the Ruby app at `ruby-sample-app`, but now `build` fails because it is currently written to error out.

katacoda/scenarios/buildpack-author-guide/build-app.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ pack build test-ruby-app --path ./ruby-sample-app --buildpack ./ruby-buildpack
122122
123123
You will see the following output:
124124
125-
<!-- test:assert=contains;ignore-lines=... -->
126125
```
127126
===> DETECTING
128127
...

katacoda/scenarios/buildpack-author-guide/detection.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ pack build test-ruby-app --path ./ruby-sample-app --buildpack ./ruby-buildpack
3333
3434
You should see the following output:
3535
36-
<!-- test:assert=contains -->
3736
```
3837
Previous image with name "test-ruby-app" not found
3938
===> DETECTING
@@ -42,7 +41,7 @@ examples/ruby 0.0.1
4241
===> BUILDING
4342
---> Ruby Buildpack
4443
ERROR: failed to build: exit status 1
45-
ERROR: failed to build: executing lifecycle
44+
ERROR: failed to build: executing lifecycle: failed with status code: 51
4645
```
4746

4847
Notice that `detect` now passes because there is a valid `Gemfile` in the Ruby app at `ruby-sample-app`, but now `build` fails because it is currently written to error out.

0 commit comments

Comments
 (0)