[PATCH master] ci: fix build on master with newer container image

[PATCH master] ci: fix build on master with newer container image

[Ahmad Fatoum]

The workflow yaml references the newest container, which now has GCC
v13.1 after the updates merged to next.

The work flow yaml on master still hardcodes GCC 12.2 though, leading
to build breakage. As the container now defines all CROSS_COMPILE_*
variables by default, we can just drop them from master to fix the
build.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 .github/workflows/test-defconfigs.yml     | 6 ------
 .github/workflows/test-labgrid-pytest.yml | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/.github/workflows/test-defconfigs.yml b/.github/workflows/test-defconfigs.yml
index 108e54d289a0..71e440793ce5 100644
--- a/.github/workflows/test-defconfigs.yml
+++ b/.github/workflows/test-defconfigs.yml
@@ -32,12 +32,6 @@ jobs:
       run: |
         export ARCH=${{matrix.arch}}
 
-        export CROSS_COMPILE_arm=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-
-        export CROSS_COMPILE_arm64=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-
-        export CROSS_COMPILE_mips=/opt/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux-
-        export CROSS_COMPILE_powerpc=/opt/gcc-12.2.0-nolibc/powerpc-linux/bin/powerpc-linux-
-        export CROSS_COMPILE_riscv=/opt/gcc-12.2.0-nolibc/riscv32-linux/bin/riscv32-linux-
-
         ./test/generate-dummy-fw.sh
 
         ./MAKEALL -O build-${{matrix.arch}} -k test/kconfig/disable_size_check.kconf \
diff --git a/.github/workflows/test-labgrid-pytest.yml b/.github/workflows/test-labgrid-pytest.yml
index 2c741500663e..399de6dc077a 100644
--- a/.github/workflows/test-labgrid-pytest.yml
+++ b/.github/workflows/test-labgrid-pytest.yml
@@ -42,12 +42,6 @@ jobs:
       run: |
         export ARCH=${{matrix.arch}}
 
-        export CROSS_COMPILE_arm=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-
-        export CROSS_COMPILE_arm64=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-
-        export CROSS_COMPILE_mips=/opt/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux-
-        export CROSS_COMPILE_powerpc=/opt/gcc-12.2.0-nolibc/powerpc-linux/bin/powerpc-linux-
-        export CROSS_COMPILE_riscv=/opt/gcc-12.2.0-nolibc/riscv32-linux/bin/riscv32-linux-
-
         ./test/generate-dummy-fw.sh
 
         ./MAKEALL -O build-${{matrix.arch}} -k test/kconfig/enable_self_test.kconf \
-- 
2.38.5

Re: [PATCH master] ci: fix build on master with newer container image

[Sascha Hauer]

On Fri, Jun 09, 2023 at 03:58:11PM +0200, Ahmad Fatoum wrote:
> The workflow yaml references the newest container, which now has GCC
> v13.1 after the updates merged to next.
> 
> The work flow yaml on master still hardcodes GCC 12.2 though, leading
> to build breakage. As the container now defines all CROSS_COMPILE_*
> variables by default, we can just drop them from master to fix the
> build.
> 
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
>  .github/workflows/test-defconfigs.yml     | 6 ------
>  .github/workflows/test-labgrid-pytest.yml | 6 ------
>  2 files changed, 12 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/.github/workflows/test-defconfigs.yml b/.github/workflows/test-defconfigs.yml
> index 108e54d289a0..71e440793ce5 100644
> --- a/.github/workflows/test-defconfigs.yml
> +++ b/.github/workflows/test-defconfigs.yml
> @@ -32,12 +32,6 @@ jobs:
>        run: |
>          export ARCH=${{matrix.arch}}
>  
> -        export CROSS_COMPILE_arm=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-
> -        export CROSS_COMPILE_arm64=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-
> -        export CROSS_COMPILE_mips=/opt/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux-
> -        export CROSS_COMPILE_powerpc=/opt/gcc-12.2.0-nolibc/powerpc-linux/bin/powerpc-linux-
> -        export CROSS_COMPILE_riscv=/opt/gcc-12.2.0-nolibc/riscv32-linux/bin/riscv32-linux-
> -
>          ./test/generate-dummy-fw.sh
>  
>          ./MAKEALL -O build-${{matrix.arch}} -k test/kconfig/disable_size_check.kconf \
> diff --git a/.github/workflows/test-labgrid-pytest.yml b/.github/workflows/test-labgrid-pytest.yml
> index 2c741500663e..399de6dc077a 100644
> --- a/.github/workflows/test-labgrid-pytest.yml
> +++ b/.github/workflows/test-labgrid-pytest.yml
> @@ -42,12 +42,6 @@ jobs:
>        run: |
>          export ARCH=${{matrix.arch}}
>  
> -        export CROSS_COMPILE_arm=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-
> -        export CROSS_COMPILE_arm64=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-
> -        export CROSS_COMPILE_mips=/opt/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux-
> -        export CROSS_COMPILE_powerpc=/opt/gcc-12.2.0-nolibc/powerpc-linux/bin/powerpc-linux-
> -        export CROSS_COMPILE_riscv=/opt/gcc-12.2.0-nolibc/riscv32-linux/bin/riscv32-linux-
> -
>          ./test/generate-dummy-fw.sh
>  
>          ./MAKEALL -O build-${{matrix.arch}} -k test/kconfig/enable_self_test.kconf \
> -- 
> 2.38.5
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |