Skip to content

Commit 224cf42

Browse files
authored
Test against Heroku-26 in CI (#157)
The buildpack itself didn't need any changes to work with Heroku-26. GUS-W-20776604.
1 parent 46de8e2 commit 224cf42

7 files changed

Lines changed: 24 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
options: --user root
1717
strategy:
1818
matrix:
19-
stack_number: ["22", "24"]
19+
stack_number: ["22", "24", "26"]
2020
env:
2121
STACK: heroku-${{ matrix.stack_number }}
2222
steps:

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
test: heroku-24-build heroku-22-build
1+
test: heroku-26-build heroku-24-build heroku-22-build
22

33
shellcheck:
44
@shellcheck -x bin/compile bin/detect bin/release bin/report
55

6+
heroku-26-build:
7+
@echo "Running tests in docker (heroku-26-build)..."
8+
@docker run --user root -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-26" heroku/heroku:26-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
9+
@echo ""
10+
611
heroku-24-build:
712
@echo "Running tests in docker (heroku-24-build)..."
813
@docker run --user root -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-24" heroku/heroku:24-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# no resolute package for wkhtmltopdf yet, so using jammy package
2+
https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
:repo:deb http://us.archive.ubuntu.com/ubuntu/ jammy multiverse
2-
fasttracker2
2+
translate-shell
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
:repo:deb http://us.archive.ubuntu.com/ubuntu/ noble multiverse
2-
fasttracker2
2+
translate-shell
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
:repo:deb http://us.archive.ubuntu.com/ubuntu/ resolute multiverse
2+
translate-shell

test/run

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ testCompileCustomPackageUrl() {
7979
[heroku-22]="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb"
8080
# no noble package for wkhtmltopdf yet, so using jammy package
8181
[heroku-24]="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb"
82+
# no resolute package for wkhtmltopdf yet, so using jammy package
83+
[heroku-26]="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb"
8284
)
8385
compile "custom-package-url-$STACK"
8486
assertCaptured "Updating APT package index"
@@ -94,6 +96,8 @@ testReportCustomPackageUrl() {
9496
[heroku-22]="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb"
9597
# no noble package for wkhtmltopdf yet, so using jammy package
9698
[heroku-24]="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb"
99+
# no resolute package for wkhtmltopdf yet, so using jammy package
100+
[heroku-26]="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb"
97101
)
98102
report "custom-package-url-$STACK"
99103
assertNotCaptured "^packages"
@@ -106,13 +110,15 @@ testCompileCustomRepository() {
106110
declare -A ubuntu_release_names=(
107111
[heroku-22]="jammy"
108112
[heroku-24]="noble"
113+
[heroku-26]="resolute"
109114
)
115+
arch="$(dpkg --print-architecture)"
110116
compile "custom-repository-$STACK"
111117
assertCaptured "Adding custom repositories"
112118
assertCaptured "Updating APT package index"
113-
assertCaptured "http://us.archive.ubuntu.com/ubuntu ${ubuntu_release_names[$STACK]}/multiverse amd64 Packages"
114-
assertCaptured "Fetching .debs for fasttracker2"
115-
assertCaptured "Installing fasttracker2"
119+
assertCaptured "http://us.archive.ubuntu.com/ubuntu ${ubuntu_release_names[$STACK]}/multiverse ${arch} Packages"
120+
assertCaptured "Fetching .debs for translate-shell"
121+
assertCaptured "Installing translate-shell"
116122
assertCaptured "Writing profile script"
117123
assertCaptured "Rewrite package-config files"
118124
assertCapturedSuccess
@@ -122,9 +128,10 @@ testReportCustomRepository() {
122128
declare -A ubuntu_release_names=(
123129
[heroku-22]="jammy"
124130
[heroku-24]="noble"
131+
[heroku-26]="resolute"
125132
)
126133
report "custom-repository-$STACK"
127-
assertCaptured "packages: \"fasttracker2\""
134+
assertCaptured "packages: \"translate-shell\""
128135
assertNotCaptured "custom_packages"
129136
assertCaptured "custom_repositories: \"deb http://us.archive.ubuntu.com/ubuntu/ ${ubuntu_release_names[$STACK]} multiverse\""
130137
assertCapturedSuccess

0 commit comments

Comments
 (0)