From eb2357ac5fd972920b0a87a362906fe9fb066a7b Mon Sep 17 00:00:00 2001 From: mo khan Date: Mon, 9 Jun 2025 14:14:01 -0600 Subject: chore: fix integration tests in ci --- .gitlab-ci.yml | 3 +-- bin/bootstrap | 15 +++++++++++++++ bin/cibuild | 12 ++---------- 3 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 bin/bootstrap 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 -- cgit v1.2.3