Merge branch 'main' into allow_starkbank_ecdsa_2

.github/workflows/test-and-deploy.yml

@@ -31,6 +31,11 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_AUTH_TOKEN }}
 
+      - name: Install Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
       - name: Run Unit Tests
         run: make test-docker version=${{ matrix.php }}
 

.gitignore

@@ -10,7 +10,7 @@ test.php
 .idea/
 *.code-workspace
 .vscode
-prism*
+prism/
 temp.php
 TODO.txt
 sendgrid-php.zip

Makefile

@@ -29,7 +29,6 @@ test-integ: test
 
 version ?= latest
 test-docker:
-	curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/HEAD/prism/prism.sh -o prism.sh
 	dependencies=lowest version=$(version) bash ./prism.sh
 	dependencies=highest version=$(version) bash ./prism.sh
 

prism.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+rm -rf prism && mkdir -p prism && cd prism
+git clone --depth 1 https://github.com/sendgrid/sendgrid-oai .
+cd prism
+
+docker compose build --parallel
+
+if [ -z "$command" ]; then
+  docker compose up --force-recreate --abort-on-container-exit --remove-orphans
+else
+  docker compose run helper-runner "$command"
+  docker compose down
+fi