Skip to content

Commit

Permalink
Making the releases work again with the new java requirements.
Browse files Browse the repository at this point in the history
  • Loading branch information
hzeller committed Dec 19, 2023
1 parent 4f5d869 commit 373c4f4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verible-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ jobs:
runs-on: [self-hosted, Linux, X64, gcp-custom-runners]
# Github actions resources are limited; don't build artifacts for all
# platforms on every pull request, only on push.
if: ${{github.event_name == 'push'}}
#if: ${{github.event_name == 'push'}}
strategy:
fail-fast: false
matrix:
Expand Down
4 changes: 4 additions & 0 deletions bazel/win_flex_bison.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ remote_win_flex_bison = repository_rule(
)

def win_flex_configure(name, url, sha256 = ""):
# testing. This should be dependent on if we're building for win
print("Skipping configure")
return

remote_win_flex_bison(
name = name,
url = url,
Expand Down
1 change: 1 addition & 0 deletions releasing/centos.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ RUN yum install -y \
redhat-lsb \
tar \
wget \
java-11-openjdk-devel \
python3
4 changes: 3 additions & 1 deletion releasing/docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,14 @@ OUT_DIR=${TARGET_OS}-${TARGET_VERSION}
mkdir -p "${OUT_DIR}"
sed "s#${TARGET_OS}:VERSION#${TARGET_OS}:${TARGET_VERSION}#g" ${TARGET_OS}.dockerfile > ${OUT_DIR}/Dockerfile

BAZEL_OPTS="${BAZEL_OPTS} --java_runtime_version=local_jdk --tool_java_runtime_version=local_jdk"

case "$TARGET_OS" in
ubuntu)
# Compiler
[ "$TARGET_VERSION" = xenial ] || [ "$TARGET_VERSION" = bionic ] && _version="$TARGET_VERSION" || _version="common"
cat ${TARGET_OS}/${_version}/compiler.dockerstage >> ${OUT_DIR}/Dockerfile

# Use local flex/bison on Jammy
if [ "$TARGET_VERSION" = jammy ]; then
BAZEL_OPTS="${BAZEL_OPTS} --//bazel:use_local_flex_bison"
Expand Down

0 comments on commit 373c4f4

Please sign in to comment.