Skip to content

Commit bc351e2

Browse files
OldManYellsAtCloudotavio
authored andcommitted
firefox: update 128.5.0esr -> 128.5.1esr, update workflows
Beside updating to the latest ESR FF, this contains 2 extra smallish changes: 1. Added a new github runner, on a beefier machine ("desktop"), which, in theory should finish faster with the PR actions. However not all workflows can run there, due to its operating system - those ones remain the old laptop ("acer"). 2. Instead of magically deleting some lines from cargo_home/config, I try add a somewhat better solution, and also add some comments about it. cargo-common adds the git SRC_URIs to this config, that fails the build (and always did). Instead of just deleting these lines, try to avoid adding them in the first place, with some new tasks. GitHub CI changes: Instead of running the CI builds on just the host OS, run them in a Docker container. That way the host OS doesn't matter, which started to become a problem on my machines.
1 parent 3f2d412 commit bc351e2

File tree

241 files changed

+1373
-1115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+1373
-1115
lines changed

.github/workflows/kirkstone-aarch64-v128.5.0esr.yml renamed to .github/workflows/kirkstone-aarch64-v128.5.1esr.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: kirkstone-aarch64-128.5.0esr
1+
name: kirkstone-aarch64-128.5.1esr
22
run-name: Build ESR Firefox for 64-bit ARM architecture with Kirkstone
33
on:
44
pull_request:
@@ -9,15 +9,22 @@ on:
99

1010
jobs:
1111
build-kirkstone-aarch64-esr:
12-
runs-on: [self-hosted]
12+
runs-on: [self-hosted, desktop]
13+
container:
14+
image: skandigraun/yocto:latest
15+
volumes:
16+
- yocto:/yocto
1317
environment: ff-build-env
1418
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
path: workspace/kirkstone/meta-browser
18-
ref: ${{ github.ref }}
1919
- run: |
20-
cd workspace/kirkstone
20+
if [ -e /yocto/test-images/kirkstone-aarch64-esr.wic.bz2 ]; then
21+
exit 0
22+
fi
23+
mkdir -p /yocto/kirkstone
24+
cd /yocto/kirkstone
25+
rm -rf meta-browser
26+
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
27+
git -C meta-browser checkout $GITHUB_HEAD_REF
2128
kas checkout --update ./meta-browser/meta-firefox/kas/kirkstone-esr-aarch64-test.yml
2229
kas shell ./meta-browser/meta-firefox/kas/kirkstone-esr-aarch64-test.yml -c "bitbake -c clean firefox firefox-test-image \
2330
firefox-l10n-ach firefox-l10n-en-gb firefox-l10n-hi-in firefox-l10n-ms firefox-l10n-sr \
@@ -42,7 +49,5 @@ jobs:
4249
firefox-l10n-mk firefox-l10n-son firefox-l10n-en-ca firefox-l10n-he firefox-l10n-mr \
4350
firefox-l10n-sq"
4451
kas build ./meta-browser/meta-firefox/kas/kirkstone-esr-aarch64-test.yml
45-
if [ ! -e ~/test-images/kirkstone-aarch64-esr.wic.bz2 ]; then
46-
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64-*.rootfs.wic.bz2 ~/test-images/kirkstone-aarch64-esr.wic.bz2
47-
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64-*.rootfs.wic.bmap ~/test-images/kirkstone-aarch64-esr.wic.bmap
48-
fi
52+
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64-*.rootfs.wic.bz2 /yocto/test-images/kirkstone-aarch64-esr.wic.bz2
53+
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64-*.rootfs.wic.bmap /yocto/test-images/kirkstone-aarch64-esr.wic.bmap

.github/workflows/kirkstone-aarch64-v133.0.3.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,22 @@ on:
99

1010
jobs:
1111
build-kirkstone-aarch64-latest:
12-
runs-on: [self-hosted]
12+
runs-on: [self-hosted, desktop]
13+
container:
14+
image: skandigraun/yocto:latest
15+
volumes:
16+
- yocto:/yocto
1317
environment: ff-build-env
1418
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
path: workspace/kirkstone/meta-browser
18-
ref: ${{ github.ref }}
1919
- run: |
20-
cd workspace/kirkstone
20+
if [ -e /yocto/test-images/kirkstone-aarch64-latest.wic.bz2 ]; then
21+
exit 0
22+
fi
23+
mkdir -p /yocto/kirkstone
24+
cd /yocto/kirkstone
25+
rm -rf meta-browser
26+
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
27+
git -C meta-browser checkout $GITHUB_HEAD_REF
2128
kas checkout --update ./meta-browser/meta-firefox/kas/kirkstone-latest-aarch64-test.yml
2229
kas shell ./meta-browser/meta-firefox/kas/kirkstone-latest-aarch64-test.yml -c "bitbake -c clean firefox firefox-test-image \
2330
firefox-l10n-ach firefox-l10n-en-gb firefox-l10n-hi-in firefox-l10n-ms firefox-l10n-sr \
@@ -42,7 +49,5 @@ jobs:
4249
firefox-l10n-mk firefox-l10n-son firefox-l10n-en-ca firefox-l10n-he firefox-l10n-mr \
4350
firefox-l10n-sq"
4451
kas build ./meta-browser/meta-firefox/kas/kirkstone-latest-aarch64-test.yml
45-
if [ ! -e ~/test-images/kirkstone-aarch64-latest.wic.bz2 ]; then
46-
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64-*.rootfs.wic.bz2 ~/test-images/kirkstone-aarch64-latest.wic.bz2
47-
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64-*.rootfs.wic.bmap ~/test-images/kirkstone-aarch64-latest.wic.bmap
48-
fi
52+
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64-*.rootfs.wic.bz2 /yocto/test-images/kirkstone-aarch64-latest.wic.bz2
53+
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64-*.rootfs.wic.bmap /yocto/test-images/kirkstone-aarch64-latest.wic.bmap

.github/workflows/kirkstone-arm-v128.5.0esr.yml renamed to .github/workflows/kirkstone-arm-v128.5.1esr.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: kirkstone-arm-128.5.0esr
1+
name: kirkstone-arm-128.5.1esr
22
run-name: Build ESR Firefox for 32-bit ARM architecture with Kirkstone
33
on:
44
pull_request:
@@ -9,15 +9,22 @@ on:
99

1010
jobs:
1111
build-kirkstone-arm-esr:
12-
runs-on: [self-hosted]
12+
runs-on: [self-hosted, desktop]
13+
container:
14+
image: skandigraun/yocto:latest
15+
volumes:
16+
- yocto:/yocto
1317
environment: ff-build-env
1418
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
path: workspace/kirkstone/meta-browser
18-
ref: ${{ github.ref }}
1919
- run: |
20-
cd workspace/kirkstone
20+
if [ -e /yocto/test-images/kirkstone-arm-esr.wic.bz2 ]; then
21+
exit 0
22+
fi
23+
mkdir -p /yocto/kirkstone
24+
cd /yocto/kirkstone
25+
rm -rf meta-browser
26+
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
27+
git -C meta-browser checkout $GITHUB_HEAD_REF
2128
kas checkout --update ./meta-browser/meta-firefox/kas/kirkstone-esr-arm-test.yml
2229
kas shell ./meta-browser/meta-firefox/kas/kirkstone-esr-arm-test.yml -c "bitbake -c clean firefox firefox-test-image \
2330
firefox-l10n-ach firefox-l10n-en-gb firefox-l10n-hi-in firefox-l10n-ms firefox-l10n-sr \
@@ -42,7 +49,5 @@ jobs:
4249
firefox-l10n-mk firefox-l10n-son firefox-l10n-en-ca firefox-l10n-he firefox-l10n-mr \
4350
firefox-l10n-sq"
4451
kas build ./meta-browser/meta-firefox/kas/kirkstone-esr-arm-test.yml
45-
if [ ! -e ~/test-images/kirkstone-arm-esr.wic.bz2 ]; then
46-
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3-*.rootfs.wic.bz2 ~/test-images/kirkstone-arm-esr.wic.bz2
47-
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3-*.rootfs.wic.bmap ~/test-images/kirkstone-arm-esr.wic.bmap
48-
fi
52+
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3-*.rootfs.wic.bz2 /yocto/test-images/kirkstone-arm-esr.wic.bz2
53+
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3-*.rootfs.wic.bmap /yocto/test-images/kirkstone-arm-esr.wic.bmap

.github/workflows/kirkstone-arm-v133.0.3.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,22 @@ on:
99

1010
jobs:
1111
build-kirkstone-arm-latest:
12-
runs-on: [self-hosted]
12+
runs-on: [self-hosted, desktop]
13+
container:
14+
image: skandigraun/yocto:latest
15+
volumes:
16+
- yocto:/yocto
1317
environment: ff-build-env
1418
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
path: workspace/kirkstone/meta-browser
18-
ref: ${{ github.ref }}
1919
- run: |
20-
cd workspace/kirkstone
20+
if [ -e /yocto/test-images/kirkstone-arm-latest.wic.bz2 ]; then
21+
exit 0
22+
fi
23+
mkdir -p /yocto/kirkstone
24+
cd /yocto/kirkstone
25+
rm -rf meta-browser
26+
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
27+
git -C meta-browser checkout $GITHUB_HEAD_REF
2128
kas checkout --update ./meta-browser/meta-firefox/kas/kirkstone-latest-arm-test.yml
2229
kas shell ./meta-browser/meta-firefox/kas/kirkstone-latest-arm-test.yml -c "bitbake -c clean firefox firefox-test-image \
2330
firefox-l10n-ach firefox-l10n-en-gb firefox-l10n-hi-in firefox-l10n-ms firefox-l10n-sr \
@@ -42,7 +49,5 @@ jobs:
4249
firefox-l10n-mk firefox-l10n-son firefox-l10n-en-ca firefox-l10n-he firefox-l10n-mr \
4350
firefox-l10n-sq"
4451
kas build ./meta-browser/meta-firefox/kas/kirkstone-latest-arm-test.yml
45-
if [ ! -e ~/test-images/kirkstone-arm-latest.wic.bz2 ]; then
46-
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3-*.rootfs.wic.bz2 ~/test-images/kirkstone-arm-latest.wic.bz2
47-
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3-*.rootfs.wic.bmap ~/test-images/kirkstone-arm-latest.wic.bmap
48-
fi
52+
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3-*.rootfs.wic.bz2 /yocto/test-images/kirkstone-arm-latest.wic.bz2
53+
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3-*.rootfs.wic.bmap /yocto/test-images/kirkstone-arm-latest.wic.bmap

.github/workflows/kirkstone-x86_64-v128.5.0esr.yml renamed to .github/workflows/kirkstone-x86_64-v128.5.1esr.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: kirkstone-x86_64-128.5.0esr
1+
name: kirkstone-x86_64-128.5.1esr
22
run-name: Build ESR Firefox for x86_64 architecture with Kirkstone
33
on:
44
pull_request:
@@ -9,15 +9,22 @@ on:
99

1010
jobs:
1111
build-kirkstone-x86_64-esr:
12-
runs-on: [self-hosted]
12+
runs-on: [self-hosted, desktop]
13+
container:
14+
image: skandigraun/yocto:latest
15+
volumes:
16+
- yocto:/yocto
1317
environment: ff-build-env
1418
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
path: workspace/kirkstone/meta-browser
18-
ref: ${{ github.ref }}
1919
- run: |
20-
cd workspace/kirkstone
20+
if [ -d /yocto/test-images/kirkstone-esr-x86 ]; then
21+
exit 0
22+
fi
23+
mkdir -p /yocto/kirkstone
24+
cd /yocto/kirkstone
25+
rm -rf meta-browser
26+
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
27+
git -C meta-browser checkout $GITHUB_HEAD_REF
2128
kas checkout --update ./meta-browser/meta-firefox/kas/kirkstone-esr-x86_64-test.yml
2229
kas shell ./meta-browser/meta-firefox/kas/kirkstone-esr-x86_64-test.yml -c "bitbake -c clean firefox firefox-test-image \
2330
firefox-l10n-ach firefox-l10n-en-gb firefox-l10n-hi-in firefox-l10n-ms firefox-l10n-sr \
@@ -42,5 +49,4 @@ jobs:
4249
firefox-l10n-mk firefox-l10n-son firefox-l10n-en-ca firefox-l10n-he firefox-l10n-mr \
4350
firefox-l10n-sq"
4451
kas build ./meta-browser/meta-firefox/kas/kirkstone-esr-x86_64-test.yml
45-
rm -rf build/tmp/deploy/images/esr
46-
cp -r build/tmp/deploy/images/qemux86-64 build/tmp/deploy/images/esr
52+
cp -r build/tmp/deploy/images/qemux86-64 /yocto/test-images/kirkstone-esr-x86

.github/workflows/kirkstone-x86_64-v133.0.3.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,22 @@ on:
99

1010
jobs:
1111
build-kirkstone-x86_64-latest:
12-
runs-on: [self-hosted]
12+
runs-on: [self-hosted, desktop]
13+
container:
14+
image: skandigraun/yocto:latest
15+
volumes:
16+
- yocto:/yocto
1317
environment: ff-build-env
1418
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
path: workspace/kirkstone/meta-browser
18-
ref: ${{ github.ref }}
1919
- run: |
20-
cd workspace/kirkstone
20+
if [ -d /yocto/test-images/kirkstone-latest-x86 ]; then
21+
exit 0
22+
fi
23+
mkdir -p /yocto/kirkstone
24+
cd /yocto/kirkstone
25+
rm -rf meta-browser
26+
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
27+
git -C meta-browser checkout $GITHUB_HEAD_REF
2128
kas checkout --update ./meta-browser/meta-firefox/kas/kirkstone-latest-x86_64-test.yml
2229
kas shell ./meta-browser/meta-firefox/kas/kirkstone-latest-x86_64-test.yml -c "bitbake -c clean firefox firefox-test-image \
2330
firefox-l10n-ach firefox-l10n-en-gb firefox-l10n-hi-in firefox-l10n-ms firefox-l10n-sr \
@@ -42,5 +49,4 @@ jobs:
4249
firefox-l10n-mk firefox-l10n-son firefox-l10n-en-ca firefox-l10n-he firefox-l10n-mr \
4350
firefox-l10n-sq"
4451
kas build ./meta-browser/meta-firefox/kas/kirkstone-latest-x86_64-test.yml
45-
rm -rf build/tmp/deploy/images/latest
46-
cp -r build/tmp/deploy/images/qemux86-64 build/tmp/deploy/images/latest
52+
cp -r build/tmp/deploy/images/qemux86-64 /yocto/test-images/kirkstone-latest-x86

.github/workflows/scarthgap-aarch64-v128.5.0esr.yml renamed to .github/workflows/scarthgap-aarch64-v128.5.1esr.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: scarthgap-aarch64-128.5.0esr
1+
name: scarthgap-aarch64-128.5.1esr
22
run-name: Build ESR Firefox for 64-bit ARM architecture with Scarthgap
33
on:
44
pull_request:
@@ -9,15 +9,22 @@ on:
99

1010
jobs:
1111
build-scarthgap-aarch64-esr:
12-
runs-on: [self-hosted]
12+
runs-on: [self-hosted, desktop]
13+
container:
14+
image: skandigraun/yocto:latest
15+
volumes:
16+
- yocto:/yocto
1317
environment: ff-build-env
1418
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
path: workspace/scarthgap/meta-browser
18-
ref: ${{ github.ref }}
1919
- run: |
20-
cd workspace/scarthgap
20+
if [ -e /yocto/test-images/scarthgap-aarch64-esr.wic.bz2 ]; then
21+
exit 0
22+
fi
23+
mkdir -p /yocto/scarthgap
24+
cd /yocto/scarthgap
25+
rm -rf meta-browser
26+
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
27+
git -C meta-browser checkout $GITHUB_HEAD_REF
2128
kas checkout --update ./meta-browser/meta-firefox/kas/scarthgap-esr-aarch64-test.yml
2229
kas shell ./meta-browser/meta-firefox/kas/scarthgap-esr-aarch64-test.yml -c "bitbake -c clean firefox firefox-test-image \
2330
firefox-l10n-ach firefox-l10n-en-gb firefox-l10n-hi-in firefox-l10n-ms firefox-l10n-sr \
@@ -43,7 +50,5 @@ jobs:
4350
firefox-l10n-sq"
4451
kas shell ./meta-browser/meta-firefox/kas/scarthgap-esr-aarch64-test.yml -c "bitbake -c clean rust-native cargo cargo-native libstd-rs rust-llvm-native"
4552
kas build ./meta-browser/meta-firefox/kas/scarthgap-esr-aarch64-test.yml
46-
if [ ! -e ~/test-images/scarthgap-aarch64-esr.wic.bz2 ]; then
47-
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64.rootfs-*.wic.bz2 ~/test-images/scarthgap-aarch64-esr.wic.bz2
48-
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64.rootfs-*.wic.bmap ~/test-images/scarthgap-aarch64-esr.wic.bmap
49-
fi
53+
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64.rootfs-*.wic.bz2 /yocto/test-images/scarthgap-aarch64-esr.wic.bz2
54+
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64.rootfs-*.wic.bmap /yocto/test-images/scarthgap-aarch64-esr.wic.bmap

.github/workflows/scarthgap-aarch64-v133.0.3.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,22 @@ on:
99

1010
jobs:
1111
build-scarthgap-aarch64-latest:
12-
runs-on: [self-hosted]
12+
runs-on: [self-hosted, desktop]
13+
container:
14+
image: skandigraun/yocto:latest
15+
volumes:
16+
- yocto:/yocto
1317
environment: ff-build-env
1418
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
path: workspace/scarthgap/meta-browser
18-
ref: ${{ github.ref }}
1919
- run: |
20-
cd workspace/scarthgap
20+
if [ -e /yocto/test-images/scarthgap-aarch64-latest.wic.bz2 ]; then
21+
exit 0
22+
fi
23+
mkdir -p /yocto/scarthgap
24+
cd /yocto/scarthgap
25+
rm -rf meta-browser
26+
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
27+
git -C meta-browser checkout $GITHUB_HEAD_REF
2128
kas checkout --update ./meta-browser/meta-firefox/kas/scarthgap-latest-aarch64-test.yml
2229
kas shell ./meta-browser/meta-firefox/kas/scarthgap-latest-aarch64-test.yml -c "bitbake -c clean firefox firefox-test-image \
2330
firefox-l10n-ach firefox-l10n-en-gb firefox-l10n-hi-in firefox-l10n-ms firefox-l10n-sr \
@@ -43,7 +50,5 @@ jobs:
4350
firefox-l10n-sq"
4451
kas shell ./meta-browser/meta-firefox/kas/scarthgap-latest-aarch64-test.yml -c "bitbake -c clean rust-native cargo cargo-native libstd-rs rust-llvm-native"
4552
kas build ./meta-browser/meta-firefox/kas/scarthgap-latest-aarch64-test.yml
46-
if [ ! -e ~/test-images/scarthgap-aarch64-latest.wic.bz2 ]; then
47-
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64.rootfs-*.wic.bz2 ~/test-images/scarthgap-aarch64-latest.wic.bz2
48-
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64.rootfs-*.wic.bmap ~/test-images/scarthgap-aarch64-latest.wic.bmap
49-
fi
53+
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64.rootfs-*.wic.bz2 /yocto/test-images/scarthgap-aarch64-latest.wic.bz2
54+
mv build/tmp/deploy/images/raspberrypi3-64/firefox-test-image-raspberrypi3-64.rootfs-*.wic.bmap /yocto/test-images/scarthgap-aarch64-latest.wic.bmap

.github/workflows/scarthgap-arm-v128.5.0esr.yml renamed to .github/workflows/scarthgap-arm-v128.5.1esr.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: scarthgap-arm-128.5.0esr
1+
name: scarthgap-arm-128.5.1esr
22
run-name: Build ESR Firefox for 32-bit ARM architecture with Scarthgap
33
on:
44
pull_request:
@@ -9,15 +9,22 @@ on:
99

1010
jobs:
1111
build-scarthgap-arm-esr:
12-
runs-on: [self-hosted]
12+
runs-on: [self-hosted, desktop]
13+
container:
14+
image: skandigraun/yocto:latest
15+
volumes:
16+
- yocto:/yocto
1317
environment: ff-build-env
1418
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
path: workspace/scarthgap/meta-browser
18-
ref: ${{ github.ref }}
1919
- run: |
20-
cd workspace/scarthgap
20+
if [ -e /yocto/test-images/scarthgap-arm-esr.wic.bz2 ]; then
21+
exit 0
22+
fi
23+
mkdir -p /yocto/scarthgap
24+
cd /yocto/scarthgap
25+
rm -rf meta-browser
26+
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
27+
git -C meta-browser checkout $GITHUB_HEAD_REF
2128
kas checkout --update ./meta-browser/meta-firefox/kas/scarthgap-esr-arm-test.yml
2229
kas shell ./meta-browser/meta-firefox/kas/scarthgap-esr-arm-test.yml -c "bitbake -c clean firefox firefox-test-image \
2330
firefox-l10n-ach firefox-l10n-en-gb firefox-l10n-hi-in firefox-l10n-ms firefox-l10n-sr \
@@ -43,7 +50,5 @@ jobs:
4350
firefox-l10n-sq"
4451
kas shell ./meta-browser/meta-firefox/kas/scarthgap-esr-arm-test.yml -c "bitbake -c clean rust-native cargo cargo-native libstd-rs rust-llvm-native"
4552
kas build ./meta-browser/meta-firefox/kas/scarthgap-esr-arm-test.yml
46-
if [ ! -e ~/test-images/scarthgap-arm-esr.wic.bz2 ]; then
47-
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3.rootfs-*.wic.bz2 ~/test-images/scarthgap-arm-esr.wic.bz2
48-
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3.rootfs-*.wic.bmap ~/test-images/scarthgap-arm-esr.wic.bmap
49-
fi
53+
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3.rootfs-*.wic.bz2 /yocto/test-images/scarthgap-arm-esr.wic.bz2
54+
mv build/tmp/deploy/images/raspberrypi3/firefox-test-image-raspberrypi3.rootfs-*.wic.bmap /yocto/test-images/scarthgap-arm-esr.wic.bmap

0 commit comments

Comments
 (0)