Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
stack:
- scalingo-20
- scalingo-22
- scalingo-24
container:
image: "scalingo/${{ matrix.stack }}:latest"
env:
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ BASH_COMMAND := /bin/bash
.DEFAULT := all

all: test
test: test20 test22
test: test20 test22 test24

test20: STACK := "scalingo-20"

test20 test22: BASH_COMMAND := test/run
test20 test22: IMAGE := "scalingo/$(STACK):latest"
test20 test22:
test24: STACK := "scalingo-24"

test20 test22 test24: BASH_COMMAND := test/run
test20 test22 test24: IMAGE := "scalingo/$(STACK):latest"
test20 test22 test24:
@echo "Running tests in Docker using $(IMAGE)"
@docker run --pull always --mount type=bind,src=$(PWD),dst=/buildpack,readonly --workdir /buildpack --rm --interactive --tty --env "GITLAB_TOKEN=$(GITLAB_TOKEN)" --env "GITHUB_TOKEN=$(GITHUB_TOKEN)" --env "STACK=$(STACK)" $(IMAGE) bash -c "$(BASH_COMMAND)"
6 changes: 6 additions & 0 deletions test/defaults
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ default_nginx["scalingo-22"]="1.28."
default_composer["scalingo-22"]="2.8."
latest_composer["scalingo-22"]="2.8.11"

# Defaults for scalingo-24:
default_php["scalingo-24"]="8.1."
default_nginx["scalingo-24"]="1.28."
default_composer["scalingo-24"]="2.8."
latest_composer["scalingo-24"]="2.8.11"


test::defaults::classic() {
#
Expand Down
4 changes: 2 additions & 2 deletions test/utils
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash

# taken from
# https://github.com/ryanbrainard/heroku-buildpack-testrunner/blob/master/lib/test_utils.sh
Expand Down Expand Up @@ -112,7 +112,7 @@ test::utils::assertMatches() {

local needle
local haystack

needle="${1}"
haystack="${2}"

Expand Down
Loading