Skip to content

Commit 4aa30ed

Browse files
try to fix workflow artifacts warnings
1 parent dd03f05 commit 4aa30ed

File tree

4 files changed

+40
-18
lines changed

4 files changed

+40
-18
lines changed

.github/scripts/build-hirsute.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#!/usr/bin/env bash
22

3-
toplevel=$(git rev-parse --show-toplevel)
4-
5-
cd $toplevel || exit 1
6-
73
source plugins/envsetup
84

95
export OVERRIDER_COMPRESSION_TYPE
@@ -37,14 +33,17 @@ do_unmount "$PREFIX-armhf"
3733
do_unmount "$PREFIX-amd64"
3834

3935
shout "setting up artifacts for GitHub"
40-
mkdir -p $SUITE-{arm64,amd64,armhf}
36+
msg "creating $SUITE-{arm64,amd64,armhf} directories"
37+
mkdir -pv $SUITE-{arm64,amd64,armhf}
4138

39+
msg "copying tarballs to directories"
4240
cp -rv $frn-arm64*tar* $SUITE-arm64
4341
cp -rv $frn-armhf*tar* $SUITE-armhf
4442
cp -rv $frn-amd64*tar* $SUITE-amd64
4543

44+
msg "calculating sha256sums"
4645
sha256sum $frn-arm64*tar* > $SUITE-arm64/SHA256SUM
4746
sha256sum $frn-armhf*tar* > $SUITE-arm64/SHA256SUM
4847
sha256sum $frn-amd64*tar* > $SUITE-arm64/SHA256SUM
4948

50-
shout "done"
49+
shout "done"

.github/scripts/build-impish.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#!/usr/bin/env bash
22

3-
toplevel=$(git rev-parse --show-toplevel)
4-
5-
cd $toplevel || exit 1
6-
73
source plugins/envsetup
84

95
export OVERRIDER_COMPRESSION_TYPE
@@ -37,14 +33,17 @@ do_unmount "$PREFIX-armhf"
3733
do_unmount "$PREFIX-amd64"
3834

3935
shout "setting up artifacts for GitHub"
40-
mkdir -p $SUITE-{arm64,amd64,armhf}
36+
msg "creating $SUITE-{arm64,amd64,armhf} directories"
37+
mkdir -pv $SUITE-{arm64,amd64,armhf}
4138

39+
msg "copying tarballs to directories"
4240
cp -rv $frn-arm64*tar* $SUITE-arm64
4341
cp -rv $frn-armhf*tar* $SUITE-armhf
4442
cp -rv $frn-amd64*tar* $SUITE-amd64
4543

44+
msg "calculating sha256sums"
4645
sha256sum $frn-arm64*tar* > $SUITE-arm64/SHA256SUM
4746
sha256sum $frn-armhf*tar* > $SUITE-arm64/SHA256SUM
4847
sha256sum $frn-amd64*tar* > $SUITE-arm64/SHA256SUM
4948

50-
shout "done"
49+
shout "done"

.github/workflows/build-raw.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,69 @@ name: RawBuildTest
22
on: [push]
33
jobs:
44
BuildImpishRaw:
5+
name: build impish
56
runs-on: ubuntu-latest
67
steps:
7-
- uses: actions/checkout@v2
8+
- name: checkout repository
9+
uses: actions/checkout@v2
10+
811
- name: Docker Setup QEMU
912
uses: docker/[email protected]
13+
1014
- name: Satify Dependencies
1115
run: sudo apt update; sudo apt install git build-essential binfmt-support qemu-user-static debootstrap -y
16+
1217
- name: Trigger fs-cook
1318
run: bash .github/scripts/build-impish.sh
19+
1420
- name: save arm64 builds
1521
uses: actions/upload-artifact@v2
1622
with:
1723
name: impish-raw-arm64
1824
path: impish-arm64
25+
1926
- name: save armhf builds
2027
uses: actions/upload-artifact@v2
2128
with:
2229
name: impish-raw-armhf
2330
path: impish-armhf
31+
2432
- name: save amd64 builds
2533
uses: actions/upload-artifact@v2
2634
with:
2735
name: impish-raw-amd64
2836
path: impish-amd64
29-
BuidHirsute:
37+
38+
BuidHirsuteRaw:
39+
name: build hirsute
3040
runs-on: ubuntu-latest
3141
steps:
32-
- uses: actions/checkout@v2
42+
- name: checkout repo
43+
uses: actions/checkout@v2
44+
3345
- name: Docker Setup QEMU
3446
uses: docker/[email protected]
47+
3548
- name: Satify Dependencies
3649
run: sudo apt update; sudo apt install git build-essential binfmt-support qemu-user-static debootstrap -y
50+
3751
- name: Trigger fs-cook
3852
run: bash .github/scripts/build-hirsute.sh
53+
3954
- name: save arm64 builds
4055
uses: actions/upload-artifact@v2
4156
with:
4257
name: hirsute-raw-arm64
4358
path: hirsute-arm64
59+
4460
- name: save armhf builds
4561
uses: actions/upload-artifact@v2
4662
with:
4763
name: hirsute-raw-armhf
4864
path: hirsute-armhf
65+
4966
- name: save amd64 builds
5067
uses: actions/upload-artifact@v2
5168
with:
5269
name: hirsute-raw-amd64
5370
path: hirsute-amd64
54-
55-

plugins/envsetup

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,17 @@ do_tar_bzip() {
438438
}
439439

440440
run_cmd() {
441+
local chroot_dir=$1
442+
shift
441443
local command=$*
442-
do_chroot_ae "$chroot_dir" "$command"
444+
do_mount "$chroot_dir"
445+
if [ -d "$chroot_dir" ]; then
446+
cat <<- EOF | $SUDO chroot "$chroot_dir"
447+
$command
448+
EOF
449+
else
450+
die "chroot directory doesn't exist: $chroot_dir"
451+
fi
443452
}
444453

445454
install_pkg()

0 commit comments

Comments
 (0)