[jenkins] Add `bitcode` CI tag and rename `bitcode_aot_only` runtime preset to `bitcode`

diff --git a/configure.ac b/configure.ac
index ba4574e3f930ddfb14644f7c4d0985e3c433fc60..b96b2018f191194682e1ab0fcc6499b4d7a18cfa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -799,7 +799,7 @@ AC_ARG_WITH(xammac,          [  --with-xammac=yes,no            If you want to b
 AC_ARG_WITH(aot_hybrid,      [  --with-aot_hybrid=yes,no        If you want to build the aot_hybrid assemblies (defaults to no)],     [], [with_aot_hybrid=default])
 AC_ARG_WITH(aot_only,        [  --with-aot_only=yes,no          If you want to build the aot_only assemblies (defaults to no)],       [], [with_aot_only=default])
 
-AC_ARG_WITH(runtime_preset, [  --with-runtime_preset=net_4_x,all,aot,aot_preferred,aot_only,bitcode_aot_only   Which default profile to build (defaults to net_4_x)],  [], [with_runtime_preset=net_4_x])
+AC_ARG_WITH(runtime_preset, [  --with-runtime_preset=net_4_x,all,aot,aot_preferred,aot_only,bitcode   Which default profile to build (defaults to net_4_x)],  [], [with_runtime_preset=net_4_x])
 
 dnl
 dnl Profile defaults
@@ -845,7 +845,7 @@ elif test x$with_runtime_preset = xaot_only; then
 
    AOT_BUILD_FLAGS="-O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS"
    AOT_RUN_FLAGS="--full-aot"
-elif test x$with_runtime_preset = xbitcode_aot_only; then
+elif test x$with_runtime_preset = xbitcode; then
    DISABLE_MCS_DOCS_default=yes
    with_aot_only_default=yes
    with_bitcode_default=yes

diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh
index 9af8e8b07828b7bf9c864884fa84ee66f03c43a9..aebdc64c8ab6243c61047c3259483258dd5a30db 100755 (executable)
--- a/scripts/ci/run-jenkins.sh
+++ b/scripts/ci/run-jenkins.sh
@@ -40,6 +40,9 @@ elif [[ ${CI_TAGS} == *'aot_llvm'* ]];
 elif [[ ${CI_TAGS} == *'aot'* ]];
     then
     EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=aot";
+elif [[ ${CI_TAGS} == *'bitcode'* ]];
+    then
+    EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=bitcode";
 elif [[ ${CI_TAGS} == *'acceptance-tests'* ]];
     then
     EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --prefix=${WORKSPACE}/tmp/mono-acceptance-tests --with-sgen-default-concurrent=yes";