From a84fee9cf01b892b63115e9cb3426b41efd13426 Mon Sep 17 00:00:00 2001 From: Christopher McArthur Date: Sat, 27 Apr 2024 23:05:09 -0700 Subject: [PATCH 01/13] bump github actions --- .github/actions/install/cmake/action.yml | 2 +- .github/actions/render/defaults/action.yml | 4 ++-- .github/actions/render/tests/action.yml | 4 ++-- .github/workflows/cmake.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/install/cmake/action.yml b/.github/actions/install/cmake/action.yml index a018583ff..ad8c42e77 100644 --- a/.github/actions/install/cmake/action.yml +++ b/.github/actions/install/cmake/action.yml @@ -12,7 +12,7 @@ runs: steps: - name: Cache CMake id: cache-cmake - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: cmake-${{ inputs.version }} key: ${{ runner.name }}-${{ runner.os }}-${{ runner.arch }}-${{ job.container.id }}-cmake-${{ inputs.version }} diff --git a/.github/actions/render/defaults/action.yml b/.github/actions/render/defaults/action.yml index 4942e00d4..ba4fa3f3c 100644 --- a/.github/actions/render/defaults/action.yml +++ b/.github/actions/render/defaults/action.yml @@ -21,12 +21,12 @@ outputs: runs: using: composite steps: - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 14 - run: npm install mustache shell: bash - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 id: script env: TRAITS_NAME: ${{ inputs.traits_name }} diff --git a/.github/actions/render/tests/action.yml b/.github/actions/render/tests/action.yml index fe1f58649..b268d2977 100644 --- a/.github/actions/render/tests/action.yml +++ b/.github/actions/render/tests/action.yml @@ -10,12 +10,12 @@ inputs: runs: using: composite steps: - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 14 - run: npm install mustache shell: bash - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 env: TRAITS_NAME: ${{ inputs.traits_name }} SUITE_NAME: ${{ inputs.test_suite_name }} diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 968770356..d651ec431 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -117,7 +117,7 @@ jobs: root-hint-install-linux: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: lukka/get-cmake@latest - name: setup From 54b82c30920b701cbf34cc2f00f6ccd80c255be8 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sat, 27 Apr 2024 23:28:24 -0700 Subject: [PATCH 02/13] try compiling gcc from source --- .github/workflows/targets.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index dfda4986f..8ecd63716 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -17,16 +17,19 @@ jobs: gcc-4-8: name: GCC 4.8 runs-on: ubuntu-latest - container: - image: ubuntu:bionic-20230530 # 18.04 - env: - CC: /usr/bin/gcc-4.8 - CXX: /usr/bin/g++-4.8 steps: - run: | apt-get update - apt-get install -y g++-4.8 wget make libssl-dev - - uses: actions/checkout@v3 # Can not be upgrade as v4 needs NodeJS 20 doesn't exist next to gcc-4.8 + apt-get install -y build-essential autoconf automake libtool + + wget https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2 + tar -xjf gcc-4.8.5.tar.bz2 + cd gcc-4.8.5 + ./configure --target=${{ runner.arch }} --prefix ${{ github.workspace }}/gcc + make -j $(nproc) + make install + + - uses: actions/checkout@v4 - uses: ./.github/actions/install/cmake with: version: "3.26.3" From eada7400aa380fb28292b4db88c884626662a4b0 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sat, 27 Apr 2024 23:38:18 -0700 Subject: [PATCH 03/13] fix permissions --- .github/workflows/targets.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index 8ecd63716..7dc032d12 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -19,15 +19,15 @@ jobs: runs-on: ubuntu-latest steps: - run: | - apt-get update - apt-get install -y build-essential autoconf automake libtool + sudo apt-get update + sudo oapt-get install -y build-essential autoconf automake libtool wget https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2 tar -xjf gcc-4.8.5.tar.bz2 cd gcc-4.8.5 ./configure --target=${{ runner.arch }} --prefix ${{ github.workspace }}/gcc make -j $(nproc) - make install + sduo make install - uses: actions/checkout@v4 - uses: ./.github/actions/install/cmake From 7b7cb02d34be51345fcab024e9a3381b84d8dad8 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sat, 27 Apr 2024 23:39:44 -0700 Subject: [PATCH 04/13] typo --- .github/workflows/targets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index 7dc032d12..948510660 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -20,7 +20,7 @@ jobs: steps: - run: | sudo apt-get update - sudo oapt-get install -y build-essential autoconf automake libtool + sudo apt-get install -y build-essential autoconf automake libtool wget https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2 tar -xjf gcc-4.8.5.tar.bz2 From ce87d115787e405e7d7bcf9cc23b0a1075a396b0 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sat, 27 Apr 2024 23:50:30 -0700 Subject: [PATCH 05/13] dont set target --- .github/workflows/targets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index 948510660..94e901a76 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -25,7 +25,7 @@ jobs: wget https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2 tar -xjf gcc-4.8.5.tar.bz2 cd gcc-4.8.5 - ./configure --target=${{ runner.arch }} --prefix ${{ github.workspace }}/gcc + ./configure --prefix ${{ github.workspace }}/gcc make -j $(nproc) sduo make install From 72a97133a2bfe6b841955f05db33d37d90a657b5 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sat, 27 Apr 2024 23:55:00 -0700 Subject: [PATCH 06/13] add more deps --- .github/workflows/targets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index 94e901a76..0c0eec8e7 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -20,7 +20,7 @@ jobs: steps: - run: | sudo apt-get update - sudo apt-get install -y build-essential autoconf automake libtool + sudo apt-get install -y build-essential autoconf automake libtool libgmp-dev libmpfr-dev libmpc-dev wget https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2 tar -xjf gcc-4.8.5.tar.bz2 From 2a6c89d7c79870618b3073ed217fd8b54dcd2057 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sun, 28 Apr 2024 00:12:10 -0700 Subject: [PATCH 07/13] patch gcc4.x when building from newer gcc https://osmocom.org/issues/1916 https://android.googlesource.com/toolchain/gcc/+/e46354e85363dbd7ea85492f70af89273881709f%5E%21/#F0 https://gcc.gnu.org/legacy-ml/gcc-patches/2013-09/msg02100.html --- .github/workflows/targets.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index 0c0eec8e7..45267a9c6 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -25,7 +25,11 @@ jobs: wget https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2 tar -xjf gcc-4.8.5.tar.bz2 cd gcc-4.8.5 - ./configure --prefix ${{ github.workspace }}/gcc + + wget https://trac.macports.org/raw-attachment/ticket/53076/patch-gcc46-texi.diff + git apply patch-gcc46-texi.diff + + ./configure --prefix ${{ github.workspace }}/gcc --enable-languages=c,c++ --disable-libada --disable-libssp make -j $(nproc) sduo make install From 246dbf8c4c67d4eb54402d40308e1fdbbac7f98f Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sun, 28 Apr 2024 00:17:30 -0700 Subject: [PATCH 08/13] patch for c++17 --- .github/workflows/targets.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index 45267a9c6..978c92f77 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -28,6 +28,8 @@ jobs: wget https://trac.macports.org/raw-attachment/ticket/53076/patch-gcc46-texi.diff git apply patch-gcc46-texi.diff + wget https://raw.githubusercontent.com/ChrisMacGregor/esp-open-sdk/master/1001-fix-reload1-compile-error.patch + git apply 1001-fix-reload1-compile-error.patch ./configure --prefix ${{ github.workspace }}/gcc --enable-languages=c,c++ --disable-libada --disable-libssp make -j $(nproc) From a65545e3fcc1f839d6a122096e9b12525a771646 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sun, 28 Apr 2024 00:28:44 -0700 Subject: [PATCH 09/13] patch more errors using a new compiler --- .github/workflows/targets.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index 978c92f77..e6f414249 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -30,6 +30,8 @@ jobs: git apply patch-gcc46-texi.diff wget https://raw.githubusercontent.com/ChrisMacGregor/esp-open-sdk/master/1001-fix-reload1-compile-error.patch git apply 1001-fix-reload1-compile-error.patch + wget https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=ec1cc0263f156f70693a62cf17b254a0029f4852 -O ec1cc0.patch + git apply ec1cc0.patch ./configure --prefix ${{ github.workspace }}/gcc --enable-languages=c,c++ --disable-libada --disable-libssp make -j $(nproc) From c82f4f229d3753ecb0f3af8949947e3a6f84665b Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sun, 28 Apr 2024 00:37:37 -0700 Subject: [PATCH 10/13] wget output file name --- .github/workflows/targets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index e6f414249..c1ed62b4b 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -30,7 +30,7 @@ jobs: git apply patch-gcc46-texi.diff wget https://raw.githubusercontent.com/ChrisMacGregor/esp-open-sdk/master/1001-fix-reload1-compile-error.patch git apply 1001-fix-reload1-compile-error.patch - wget https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=ec1cc0263f156f70693a62cf17b254a0029f4852 -O ec1cc0.patch + wget -O ec1cc0.patch https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=ec1cc0263f156f70693a62cf17b254a0029f4852 git apply ec1cc0.patch ./configure --prefix ${{ github.workspace }}/gcc --enable-languages=c,c++ --disable-libada --disable-libssp From 7a0d53615fb4713191298755d39aa4253dddaeb9 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sun, 28 Apr 2024 01:02:30 -0700 Subject: [PATCH 11/13] plain diff url --- .github/workflows/targets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index c1ed62b4b..055a34bb3 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -30,7 +30,7 @@ jobs: git apply patch-gcc46-texi.diff wget https://raw.githubusercontent.com/ChrisMacGregor/esp-open-sdk/master/1001-fix-reload1-compile-error.patch git apply 1001-fix-reload1-compile-error.patch - wget -O ec1cc0.patch https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=ec1cc0263f156f70693a62cf17b254a0029f4852 + wget -O ec1cc0.patch https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f156f70693a62cf17b254a0029f4852 git apply ec1cc0.patch ./configure --prefix ${{ github.workspace }}/gcc --enable-languages=c,c++ --disable-libada --disable-libssp From 411de405c1a800fd91e89cb42dcec1ed5979ce36 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Mon, 8 Jul 2024 11:53:52 -0700 Subject: [PATCH 12/13] Update targets.yml --- .github/workflows/targets.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index 055a34bb3..a151ce424 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -31,6 +31,7 @@ jobs: wget https://raw.githubusercontent.com/ChrisMacGregor/esp-open-sdk/master/1001-fix-reload1-compile-error.patch git apply 1001-fix-reload1-compile-error.patch wget -O ec1cc0.patch https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f156f70693a62cf17b254a0029f4852 + cat ec1cc0.patch git apply ec1cc0.patch ./configure --prefix ${{ github.workspace }}/gcc --enable-languages=c,c++ --disable-libada --disable-libssp From e12ba559bfb72e2e57f764e1a7da0f108f6f037c Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Mon, 15 Jul 2024 07:50:49 -0700 Subject: [PATCH 13/13] Update targets.yml --- .github/workflows/targets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml index a151ce424..e0cf45719 100644 --- a/.github/workflows/targets.yml +++ b/.github/workflows/targets.yml @@ -30,7 +30,7 @@ jobs: git apply patch-gcc46-texi.diff wget https://raw.githubusercontent.com/ChrisMacGregor/esp-open-sdk/master/1001-fix-reload1-compile-error.patch git apply 1001-fix-reload1-compile-error.patch - wget -O ec1cc0.patch https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f156f70693a62cf17b254a0029f4852 + wget -O ec1cc0.patch https://gist.githubusercontent.com/prince-chrismc/c27afb5f87dae1a7ea76341218672088/raw/923bade73ac1c848fe841599a2d469caac8e16f2/gcc4.8-ec1cc0.patch cat ec1cc0.patch git apply ec1cc0.patch