From c4e0ef3e28a9a33c4ab5ccb5f4a59a224b09cd10 Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Mon, 30 Oct 2023 15:40:58 -0400 Subject: [PATCH 1/9] inital change to arc --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b73088c45fa3a..9bd1773c32836f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,9 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: panda-arc + container: + image: ubuntu:latest steps: - name: Checkout code From 16f891096c0d0b5b1e37d38079c2eab9c35f44b1 Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Mon, 30 Oct 2023 16:09:22 -0400 Subject: [PATCH 2/9] my branch only --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bd1773c32836f..5062369b6fa47a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: Compile and publish kernels on: push: branches: - - fd4.10 + - ARC-Migration jobs: build: From 4a3cb6bd30cb0cda3a5a7d33043228b30839768f Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Mon, 30 Oct 2023 16:38:29 -0400 Subject: [PATCH 3/9] core test --- docker_inner_build_targets.xsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker_inner_build_targets.xsh b/docker_inner_build_targets.xsh index cfc715fe52a881..1251a9f1307582 100755 --- a/docker_inner_build_targets.xsh +++ b/docker_inner_build_targets.xsh @@ -40,7 +40,8 @@ def get_cc(arch): rm -rf $OUT mkdir -p $OUT -$NPROC=$(nproc).strip() +#$NPROC=$(nproc).strip() +$NPROC=40 #Now build kernels cd $BUILD_ROOT From 835f341d099c03c6c06864752834293f7869504a Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Mon, 30 Oct 2023 16:50:35 -0400 Subject: [PATCH 4/9] test --- .github/workflows/build.yml | 2 -- docker_inner_build_targets.xsh | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5062369b6fa47a..a5e44cc5c179a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,8 +8,6 @@ on: jobs: build: runs-on: panda-arc - container: - image: ubuntu:latest steps: - name: Checkout code diff --git a/docker_inner_build_targets.xsh b/docker_inner_build_targets.xsh index 1251a9f1307582..cfc715fe52a881 100755 --- a/docker_inner_build_targets.xsh +++ b/docker_inner_build_targets.xsh @@ -40,8 +40,7 @@ def get_cc(arch): rm -rf $OUT mkdir -p $OUT -#$NPROC=$(nproc).strip() -$NPROC=40 +$NPROC=$(nproc).strip() #Now build kernels cd $BUILD_ROOT From d80154062d55862afb8ec217fc5489fce1d51d5a Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Mon, 30 Oct 2023 17:09:39 -0400 Subject: [PATCH 5/9] more fast? --- docker_inner_build_targets.xsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_inner_build_targets.xsh b/docker_inner_build_targets.xsh index cfc715fe52a881..9b8eed1e1d28a1 100755 --- a/docker_inner_build_targets.xsh +++ b/docker_inner_build_targets.xsh @@ -46,7 +46,7 @@ $NPROC=$(nproc).strip() cd $BUILD_ROOT for arch in TARGETLIST: - make mrproper + make mrproper -j$NPROC TARGETS=["vmlinux"] if "arm" in arch: TARGETS.append("zImage") @@ -59,7 +59,7 @@ for arch in TARGETLIST: $CROSS_CC=get_cc(arch) mkdir -p f"build/{arch}" cp f"config.{arch}" f"build/{arch}/.config" - make ARCH=@(short_arch) CROSS_COMPILE=$CROSS_CC O=build/@(arch) olddefconfig + make ARCH=@(short_arch) CROSS_COMPILE=$CROSS_CC O=build/@(arch) olddefconfig -j$NPROC echo "Building kernel" make ARCH=@(short_arch) CROSS_COMPILE=$CROSS_CC O=build/@(arch) @(TARGETS) -j$NPROC From 88cdc8332f017ab731db9416132e0105503ce113 Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Mon, 30 Oct 2023 17:33:23 -0400 Subject: [PATCH 6/9] time it --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5e44cc5c179a1..b504173ab3eab5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: Build run: | bash docker_build.sh - tar -czvf kernels-latest.tar.gz binaries + time tar -czvf kernels-latest.tar.gz binaries - name: Save package uses: actions/upload-artifact@v3 From c5a004c29e48c175b75b129647d90f2f2745e2f1 Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Tue, 31 Oct 2023 11:16:30 -0400 Subject: [PATCH 7/9] para --- .github/workflows/build.yml | 23 ++++++++++++++++++----- docker_build.sh | 9 +++++++-- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b504173ab3eab5..f05479aaa8c0fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,24 +5,29 @@ on: branches: - ARC-Migration +env: + - BUILD_ARCHES: ["armel", "mipseb", "mipsel", "mips64eb", "mips64el"] + jobs: build: runs-on: panda-arc - + strategy: + matrix: + arch: ${{ env.BUILD_ARCHES }} steps: - name: Checkout code uses: actions/checkout@v4 - name: Build run: | - bash docker_build.sh - time tar -czvf kernels-latest.tar.gz binaries + bash docker_build.sh ${{ matrix.arch }} + tar -c -I 'xz -6 -T0' -f kernels-latest-${{ matrix.arch }}.tar.xz binaries - name: Save package uses: actions/upload-artifact@v3 with: - name: kernels-latest.tar.gz - path: kernels-latest.tar.gz + name: kernels-latest-${{ matrix.arch }}.tar.gx + path: kernels-latest-${{ matrix.arch }}.tar.gx - name: Create release id: create_release @@ -36,6 +41,14 @@ jobs: Release @${{ github.ref }} draft: true prerelease: false + - name: Download all workflow run artifacts + uses: actions/download-artifact@v3 + + - name: Combine all artifacts + run: | + mkdir -p binaries + for f in ${{ env.BUILD_ARCHES }}; do mv "kernels-latest-$f.tar.gz" binaries; done + tar -cvf kernels-latest.tar binaries - name: Upload release asset uses: actions/upload-release-asset@v1 env: diff --git a/docker_build.sh b/docker_build.sh index a71a5487ce0b26..8695d213c23bb1 100755 --- a/docker_build.sh +++ b/docker_build.sh @@ -2,8 +2,13 @@ #Commented out target list is what we'd like to have, but haven't tested #TARGETLIST="armel armeb mipseb mipsel mips64 mips64el aarch64" #These targets are ones we've tested -TARGETLIST="armel mipseb mipsel mips64eb mips64el" - +ALL_TARGETS="armel mipseb mipsel mips64eb mips64el" +if [ ! -z $1 ] +then + TARGETLIST=$1 +else + TARGETLIST=ALL_TARGETS +fi docker build -t igloo_kernel_builder . || exit docker run --rm -v `realpath .`:/linux -w /linux -e IGLOO_TARGETLIST="$TARGETLIST" -e DOCKER_USER="$USER" \ igloo_kernel_builder xonsh docker_inner_build_targets.xsh From c04e7c4107e95370d50dfaf6073bffc127814c05 Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Tue, 31 Oct 2023 11:22:58 -0400 Subject: [PATCH 8/9] typo --- docker_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_build.sh b/docker_build.sh index 8695d213c23bb1..09990085fa5167 100755 --- a/docker_build.sh +++ b/docker_build.sh @@ -7,7 +7,7 @@ if [ ! -z $1 ] then TARGETLIST=$1 else - TARGETLIST=ALL_TARGETS + TARGETLIST=$ALL_TARGETS fi docker build -t igloo_kernel_builder . || exit docker run --rm -v `realpath .`:/linux -w /linux -e IGLOO_TARGETLIST="$TARGETLIST" -e DOCKER_USER="$USER" \ From 3d0c3db0705ffbb6b746cc8598866657d9e82e4c Mon Sep 17 00:00:00 2001 From: Cole DiLorenzo Date: Tue, 31 Oct 2023 12:44:12 -0400 Subject: [PATCH 9/9] add branch --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f05479aaa8c0fd..0586465ea0af40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - ARC-Migration + - arc-speed env: - BUILD_ARCHES: ["armel", "mipseb", "mipsel", "mips64eb", "mips64el"]