summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-06-09 14:14:01 -0600
committermo khan <mo@mokhan.ca>2025-06-09 14:14:01 -0600
commiteb2357ac5fd972920b0a87a362906fe9fb066a7b (patch)
tree3f07d0b030e40b6455ebc17c48015e5bd7ed36b8
parent86bb7be6296382af734870bf8724fa67c25ffc5e (diff)
chore: fix integration tests in ci
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--bin/bootstrap15
-rwxr-xr-xbin/cibuild12
3 files changed, 18 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca7536a..250e882 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ unit:
integration:
image: ruby:latest
script:
- - sh ./bin/setup
- - sh ./bin/test
+ - sh ./bin/cibuild
variables:
DEBUG: true
diff --git a/bin/bootstrap b/bin/bootstrap
new file mode 100644
index 0000000..53d8011
--- /dev/null
+++ b/bin/bootstrap
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+[ -n "$DEBUG" ] && set -x
+
+cd "$(dirname "$0")/.."
+
+apt update -y && apt install -y gpg wget curl
+install -dm 755 /etc/apt/keyrings
+wget -qO - https://mise.jdx.dev/gpg-key.pub | gpg --dearmor | tee /etc/apt/keyrings/mise-archive-keyring.gpg 1> /dev/null
+echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg arch=amd64] https://mise.jdx.dev/deb stable main" | tee /etc/apt/sources.list.d/mise.list
+apt update
+apt install -y mise
+mise install
diff --git a/bin/cibuild b/bin/cibuild
index 2a9dec8..c7b6acf 100755
--- a/bin/cibuild
+++ b/bin/cibuild
@@ -5,14 +5,6 @@ set -e
cd "$(dirname "$0")/.."
-apt update -y && apt install -y gpg wget curl
-install -dm 755 /etc/apt/keyrings
-wget -qO - https://mise.jdx.dev/gpg-key.pub | gpg --dearmor | tee /etc/apt/keyrings/mise-archive-keyring.gpg 1> /dev/null
-echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg arch=amd64] https://mise.jdx.dev/deb stable main" | tee /etc/apt/sources.list.d/mise.list
-apt update
-apt install -y mise
-mise install
-
-bundle install
+./bin/bootstrap
+./bin/setup
./bin/test
-mise exec -- cargo test