Skip to content

Commit a23ace7

Browse files
0405ysj0405ysj
committed
Checkout repo on home dir when building debs from GH workflow
1 parent 7824781 commit a23ace7

2 files changed

Lines changed: 10 additions & 22 deletions

File tree

‎.github/workflows/presubmit.yaml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,10 @@ jobs:
208208
swap-storage: false
209209
- name: checkout repository
210210
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
211-
with:
212-
path: "android-cuttlefish"
213211
- name: Load cache config
214212
run: |
215-
cat android-cuttlefish/.config/cache-config.env >> $GITHUB_ENV
216-
echo "JOB_HASH=$(yq .jobs[\"build-debian-package-x86\"] android-cuttlefish/.github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
213+
cat .config/cache-config.env >> $GITHUB_ENV
214+
echo "JOB_HASH=$(yq .jobs[\"build-debian-package-x86\"] .github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
217215
- name: Generate cache key prefix
218216
run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${{ env.CACHE_VERSION }}-debian-package-${{ env.JOB_HASH }}" >> $GITHUB_ENV
219217
- name: Mount Bazel cache
@@ -227,7 +225,6 @@ jobs:
227225
${{ format('{0}-', env.CACHE_KEY_PREFIX) }}
228226
- name: Build CF debian packages
229227
run: |
230-
cd android-cuttlefish
231228
sudo docker build --file "tools/buildutils/cw/Containerfile" --tag "android-cuttlefish-build" .
232229
sudo docker run -v=$PWD:/mnt/build -w /mnt/build -v=$HOME/bazel-disk-cache:/root/bazel-disk-cache android-cuttlefish-build base -d /root/bazel-disk-cache
233230
sudo docker run -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build frontend
@@ -248,12 +245,10 @@ jobs:
248245
swap-storage: false
249246
- name: checkout repository
250247
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
251-
with:
252-
path: "android-cuttlefish"
253248
- name: Load cache config
254249
run: |
255-
cat android-cuttlefish/.config/cache-config.env >> $GITHUB_ENV
256-
echo "JOB_HASH=$(yq .jobs[\"build-debian-package-arm\"] android-cuttlefish/.github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
250+
cat .config/cache-config.env >> $GITHUB_ENV
251+
echo "JOB_HASH=$(yq .jobs[\"build-debian-package-arm\"] .github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
257252
- name: Generate cache key prefix
258253
run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${{ env.CACHE_VERSION }}-debian-package-${{ env.JOB_HASH }}" >> $GITHUB_ENV
259254
- name: Mount Bazel cache
@@ -267,7 +262,6 @@ jobs:
267262
${{ format('{0}-', env.CACHE_KEY_PREFIX) }}
268263
- name: Build CF debian packages
269264
run: |
270-
cd android-cuttlefish
271265
sudo docker build --file "tools/buildutils/cw/Containerfile" --tag "android-cuttlefish-build" .
272266
sudo docker run -v=$PWD:/mnt/build -w /mnt/build -v=$HOME/bazel-disk-cache:/root/bazel-disk-cache android-cuttlefish-build base -d /root/bazel-disk-cache
273267
sudo docker run -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build frontend
@@ -291,7 +285,7 @@ jobs:
291285
github-token: ${{ github.token }}
292286
- name: Build image
293287
run: |
294-
tar -xvf debs_x86.tar && mv android-cuttlefish/cuttlefish*.deb .
288+
tar -xvf debs_x86.tar
295289
sudo podman info
296290
sudo podman build -f "tools/testutils/cw/Containerfile" --tag "android-cuttlefish-e2etest:latest" .
297291
sudo podman save --quiet -o android-cuttlefish-e2etest.tar localhost/android-cuttlefish-e2etest
@@ -396,7 +390,7 @@ jobs:
396390
- name: Run check
397391
shell: bash
398392
run: |
399-
tar -xvf debs_x86.tar && mv android-cuttlefish/cuttlefish*.deb .
393+
tar -xvf debs_x86.tar
400394
./docker/image-builder.sh -m dev
401395
docker images
402396
sudo docker run --privileged -d -p 2080:2080 cuttlefish-orchestration:latest

‎.github/workflows/update-bazel-cache.yaml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,10 @@ jobs:
5656
swap-storage: false
5757
- name: checkout repository
5858
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
59-
with:
60-
path: "android-cuttlefish"
6159
- name: Load cache config
6260
run: |
63-
cat android-cuttlefish/.config/cache-config.env >> $GITHUB_ENV
64-
echo "JOB_HASH=$(yq .jobs[\"build-debian-package-x86\"] android-cuttlefish/.github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
61+
cat .config/cache-config.env >> $GITHUB_ENV
62+
echo "JOB_HASH=$(yq .jobs[\"build-debian-package-x86\"] .github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
6563
- name: Generate cache key prefix
6664
run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${{ env.CACHE_VERSION }}-debian-package-${{ env.JOB_HASH }}" >> $GITHUB_ENV
6765
- name: Mount Bazel cache
@@ -75,7 +73,6 @@ jobs:
7573
${{ github.event_name == 'push' && format('{0}-', env.CACHE_KEY_PREFIX) || '' }}
7674
- name: Build CF debian packages
7775
run: |
78-
cd android-cuttlefish
7976
sudo docker build --file "tools/buildutils/cw/Containerfile" --tag "android-cuttlefish-build" .
8077
sudo docker run -v=$PWD:/mnt/build -w /mnt/build -v=$HOME/bazel-disk-cache:/root/bazel-disk-cache android-cuttlefish-build base -d /root/bazel-disk-cache
8178
update-debian-package-arm-bazel-cache:
@@ -89,12 +86,10 @@ jobs:
8986
swap-storage: false
9087
- name: checkout repository
9188
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
92-
with:
93-
path: "android-cuttlefish"
9489
- name: Load cache config
9590
run: |
96-
cat android-cuttlefish/.config/cache-config.env >> $GITHUB_ENV
97-
echo "JOB_HASH=$(yq .jobs[\"build-debian-package-arm\"] android-cuttlefish/.github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
91+
cat .config/cache-config.env >> $GITHUB_ENV
92+
echo "JOB_HASH=$(yq .jobs[\"build-debian-package-arm\"] .github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
9893
- name: Generate cache key prefix
9994
run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${{ env.CACHE_VERSION }}-debian-package-${{ env.JOB_HASH }}" >> $GITHUB_ENV
10095
- name: Mount Bazel cache
@@ -108,6 +103,5 @@ jobs:
108103
${{ github.event_name == 'push' && format('{0}-', env.CACHE_KEY_PREFIX) || '' }}
109104
- name: Build CF debian packages
110105
run: |
111-
cd android-cuttlefish
112106
sudo docker build --file "tools/buildutils/cw/Containerfile" --tag "android-cuttlefish-build" .
113107
sudo docker run -v=$PWD:/mnt/build -w /mnt/build -v=$HOME/bazel-disk-cache:/root/bazel-disk-cache android-cuttlefish-build base -d /root/bazel-disk-cache

0 commit comments

Comments
 (0)