From 534435d9c362e9661d25772af5fdf9687c3bc5b9 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Thu, 24 Aug 2023 17:26:47 +0000
Subject: [PATCH] Resolve "update support for shen-23 runners"
---
.gitlab-ci.yml | 7 +------
tests/rust_test/testit.sh | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f7692503..b665cae32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,11 +118,6 @@ test-arm64:
- arm64
# per os items
-test-ubuntu18:
- <<: *test
- tags:
- - ubuntu18
-
test-coss9:
<<: *test
tags:
@@ -143,7 +138,7 @@ test-ubuntu22:
# deploy a docker image
#
deploy-u22:
- needs: [test-coss9, test-ubuntu18, test-ubuntu20, test-ubuntu22, test-arm32, test-arm64, test-bins-arm32, test-bins-arm64]
+ needs: [test-coss9, test-ubuntu20, test-ubuntu22, test-arm32, test-arm64, test-bins-arm32, test-bins-arm64]
stage: deploy
script:
- ./cicd_testing/do-clean.sh
diff --git a/tests/rust_test/testit.sh b/tests/rust_test/testit.sh
index 684a2bfef..0a20d0966 100755
--- a/tests/rust_test/testit.sh
+++ b/tests/rust_test/testit.sh
@@ -8,7 +8,7 @@ testone()
set -e
rustc $PUT.rs -o $PUT
- $PSZ $PUT ./$PUT.zipr $OPTS
+ $PSZ $PUT ./$PUT.zipr $OPTS || true # in case warnings happen
diff <(./$PUT 2>&1 ) <(./$PUT.zipr 2>&1 )
# turn off exit-on-error because some programs err and we need their exit code.
--
GitLab