Skip to content
Snippets Groups Projects
Commit de1f5006 authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

Merge branch '24-update-support-for-shen-23-runners' into 'master'

Resolve "update support for shen-23 runners"

Closes #24

See merge request !46
parents c0c7f3cd 534435d9
No related branches found
No related tags found
1 merge request!46Resolve "update support for shen-23 runners"
Pipeline #24993 passed
...@@ -118,11 +118,6 @@ test-arm64: ...@@ -118,11 +118,6 @@ test-arm64:
- arm64 - arm64
# per os items # per os items
test-ubuntu18:
<<: *test
tags:
- ubuntu18
test-coss9: test-coss9:
<<: *test <<: *test
tags: tags:
...@@ -143,7 +138,7 @@ test-ubuntu22: ...@@ -143,7 +138,7 @@ test-ubuntu22:
# deploy a docker image # deploy a docker image
# #
deploy-u22: 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 stage: deploy
script: script:
- ./cicd_testing/do-clean.sh - ./cicd_testing/do-clean.sh
......
...@@ -8,7 +8,7 @@ testone() ...@@ -8,7 +8,7 @@ testone()
set -e set -e
rustc $PUT.rs -o $PUT 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 ) diff <(./$PUT 2>&1 ) <(./$PUT.zipr 2>&1 )
# turn off exit-on-error because some programs err and we need their exit code. # turn off exit-on-error because some programs err and we need their exit code.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment