Skip to content

Commit 32cf3a8

Browse files
committed
New install_bazel_package.sh doesn't work in cross-platform, roll-back to original bazel tool installation method.
1 parent a5cfe81 commit 32cf3a8

File tree

4 files changed

+31
-11
lines changed

4 files changed

+31
-11
lines changed

.github/workflows/reusable-build.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414
run: pbuilder-dist stable arm64 create
1515
- name: Pbuilder arm64 update
1616
run: pbuilder-dist stable arm64 update
17-
- name: Install bazel
18-
run: cd tools/cuttlefish-host-image-installer && sudo ./utils/install_bazel_package.sh
1917
- name: Building package
2018
run: cd tools/cuttlefish-host-image-installer && ./build_cf_packages.sh
2119
- name: Create artifact

LICENSE

+25
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
1+
Files: android-cuttlefish/tools/cuttlefish-host-image-installer/*
2+
MIT License
13

4+
Copyright (c) [year] [fullname]
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
24+
---
25+
26+
Files: android-cuttlefish/*
227
Apache License
328
Version 2.0, January 2004
429
http://www.apache.org/licenses/

tools/cuttlefish-host-image-installer/build_cf_packages.sh

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ apt-get install -y git ca-certificates less
1010
apt-get install -y build-essential
1111
apt-get install -y devscripts equivs fakeroot dpkg-dev
1212
13+
apt install wget
14+
wget "https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-arm64"
15+
mv bazelisk-linux-arm64 /usr/local/bin/bazel
16+
chmod 0755 /usr/local/bin/bazel
17+
export PATH=$PATH:/usr/local/bin
18+
1319
mkdir -p /tmp/b1
1420
1521
cd /tmp/b1

tools/cuttlefish-host-image-installer/utils/install_bazel_package.sh

-9
This file was deleted.

0 commit comments

Comments
 (0)