Skip to content

Commit b8f651f

Browse files
Disable "auto" version selection option (#11)
* Don't mark fixed versions auto * Explicitly specify version for test workspace w/o system ruby * Debug logging in setup * Revert logging changes, keep pin of bashmatic version
1 parent 44a995f commit b8f651f

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

bin/deps

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
# —————————————————————————————————————————————————————————————————————————————————————
1111

1212

13+
export BASHMATIC_OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
1314
[[ -z ${BASHMATIC_HOME} ]] && export BASHMATIC_HOME="${HOME}/.bashmatic"
14-
[[ -d ${BASHMATIC_HOME} ]] || bash -c "$(curl -fsSL https://bashmatic.re1.re); bashmatic-install -q"
15+
[[ -d ${BASHMATIC_HOME} ]] || bash -c "$(curl -fsSL https://bashmatic.re1.re); bashmatic-install -v -f -b v2.7.2"
1516

1617
# shellcheck disable=SC1090
1718
source "${BASHMATIC_HOME}/init.sh" 1>/dev/null 2>&1

bin/test-suite

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,15 @@ test.buildifier() {
155155

156156
# Builds and runs workspace inside examples/simple_script
157157
test.simple-script() {
158+
# This workspace requires a version specification
159+
local RUBY_VERSION="--@rules_ruby//ruby/runtime:version=ruby-3.0 "
158160
__test.exec simple-script "
159161
cd examples/simple_script
160162
bazel ${BAZEL_OPTS} info; echo; echo
161-
bazel ${BAZEL_OPTS} build ${BAZEL_BASE_BUILD_OPTS} -- //... ; echo; echo
162-
bazel ${BAZEL_OPTS} test ${BAZEL_BASE_BUILD_OPTS} ${BAZEL_TEST_OPTS} -- //... ; echo; echo
163-
echo run :bin; bazel ${BAZEL_OPTS} run ${BAZEL_BASE_BUILD_OPTS} :bin
164-
echo run :rubocop; bazel ${BAZEL_OPTS} run ${BAZEL_BASE_BUILD_OPTS} :rubocop
163+
bazel ${BAZEL_OPTS} build ${BAZEL_BASE_BUILD_OPTS} ${RUBY_VERSION} -- //... ; echo; echo
164+
bazel ${BAZEL_OPTS} test ${BAZEL_BASE_BUILD_OPTS} ${BAZEL_TEST_OPTS} ${RUBY_VERSION} -- //... ; echo; echo
165+
echo run :bin; bazel ${BAZEL_OPTS} run ${BAZEL_BASE_BUILD_OPTS} ${RUBY_VERSION} :bin
166+
echo run :rubocop; bazel ${BAZEL_OPTS} run ${BAZEL_BASE_BUILD_OPTS} ${RUBY_VERSION} :rubocop
165167
"
166168
}
167169

ruby/runtime/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ selects.config_setting_group(
7676
selects.config_setting_group(
7777
name = "config_" + get_supported_version(version),
7878
match_any = [
79-
":config_auto",
8079
":internal_config_" + get_supported_version(version),
8180
],
8281
)

0 commit comments

Comments
 (0)