WIP heroku-24

heroku · May 18, 2024 · 75d6aa7 · 75d6aa7
1 parent 5bf5ec2
commit 75d6aa7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        stack_version: ["20", "22"]
+        stack_version: ["20", "22", "24"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        stack_version: ["20", "22"]
+        stack_version: ["20", "22", "24"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # These targets are not files
 .PHONY: compile test buildenv
 
-STACK_VERSION ?= 22
+STACK_VERSION ?= 24
 STACK := heroku-$(STACK_VERSION)
 BASE_BUILD_IMAGE := heroku/heroku:$(STACK_VERSION)-build
 PLATFORM := linux/amd64
@@ -10,15 +10,15 @@ compile:
 	@echo "Running compile using: STACK_VERSION=$(STACK_VERSION)"
 	@echo "To use a different stack, run: 'make compile STACK_VERSION=NN'"
 	@echo
-	@docker run --rm --platform=$(PLATFORM) -v "$(PWD):/src:ro" -e "STACK=$(STACK)" -w /buildpack "$(BASE_BUILD_IMAGE)" \
-		bash -c 'cp -r /src/bin /buildpack && mkdir -p /tmp/{build,cache,env} && bin/compile /tmp/build /tmp/cache /tmp/env'
+	@docker run --rm --platform=$(PLATFORM) -v "$(PWD)/bin:/buildpack/bin:ro" -e "STACK=$(STACK)" -w /buildpack "$(BASE_BUILD_IMAGE)" \
+		bash -c 'mkdir -p /tmp/{build,cache,env} && bin/compile /tmp/build /tmp/cache /tmp/env'
 	@echo
 
 test:
 	@echo "Running tests using: STACK_VERSION=$(STACK_VERSION)"
 	@echo "To use a different stack, run: 'make test STACK_VERSION=NN'"
 	@echo
-	@docker run --rm --platform=$(PLATFORM) -v "$(PWD):/buildpack:ro" -e "STACK=$(STACK)" "$(BASE_BUILD_IMAGE)" /buildpack/tests.sh
+	@docker run --rm --platform=$(PLATFORM) --user root -v "$(PWD):/buildpack:ro" -e "STACK=$(STACK)" "$(BASE_BUILD_IMAGE)" /buildpack/tests.sh
 	@echo
 
 buildenv:

diff --git a/bin/compile b/bin/compile
@@ -6,7 +6,7 @@ vendor_lib() {
     VENDOR_DIR=$3
 
     echo "-----> Installing $LIBRARY-$VERSION"
-    LIBRARY_URL="https://heroku-buildpack-geo.s3.amazonaws.com/${STACK}/${LIBRARY}/${LIBRARY}-${VERSION}.tar.gz"
+    LIBRARY_URL="https://heroku-buildpack-geo.s3.us-east-1.amazonaws.com/${STACK}/${LIBRARY}/${LIBRARY}-${VERSION}.tar.gz"
 
     mkdir -p "$VENDOR_DIR"
     if ! curl -sSf --retry 3 --retry-connrefused --connect-timeout 10 "${LIBRARY_URL}" | tar -zx -C "${VENDOR_DIR}"; then