From 816b6b5f8485acfbeea44a8f27f96eafb5845357 Mon Sep 17 00:00:00 2001 From: Avery Fischer Date: Tue, 28 May 2024 12:02:10 +0200 Subject: [PATCH 1/3] feat: Try GDBs with python3.12 --- elfutils/conda_build_config.yaml | 3 +++ elfutils/meta.yaml | 2 +- gdb-multi-arch/conda_build_config.yaml | 5 ++++- gdb-multi-arch/meta.yaml | 2 +- gdb-xtensa-esp32-elf/conda_build_config.yaml | 8 +++++++- gdb-xtensa-esp32-elf/meta.yaml | 2 +- gdb-xtensa-lx106-elf/conda_build_config.yaml | 5 ++++- gdb-xtensa-lx106-elf/meta.yaml | 2 +- 8 files changed, 22 insertions(+), 7 deletions(-) diff --git a/elfutils/conda_build_config.yaml b/elfutils/conda_build_config.yaml index 4baed9f..8ef5c2a 100644 --- a/elfutils/conda_build_config.yaml +++ b/elfutils/conda_build_config.yaml @@ -605,6 +605,7 @@ numpy: - 1.22 - 1.22 - 1.23 + - 1.25 occt: - 7.7.2 openblas: @@ -673,12 +674,14 @@ python: - 3.9.* *_cpython - 3.10.* *_cpython - 3.11.* *_cpython + - 3.12.* *_cpython python_impl: # part of a zip_keys: python, python_impl, numpy - cpython - cpython - cpython - cpython + - cpython pytorch: - '2.0' pyqt: diff --git a/elfutils/meta.yaml b/elfutils/meta.yaml index 275266f..f42758e 100644 --- a/elfutils/meta.yaml +++ b/elfutils/meta.yaml @@ -2,7 +2,7 @@ package: name: elfutils - version: {{ version }}.memfault1 + version: {{ version }}.memfault2 source: fn: elfutils-{{ version }}.tar.bz2 diff --git a/gdb-multi-arch/conda_build_config.yaml b/gdb-multi-arch/conda_build_config.yaml index 1ce3b94..d920c2c 100644 --- a/gdb-multi-arch/conda_build_config.yaml +++ b/gdb-multi-arch/conda_build_config.yaml @@ -313,7 +313,7 @@ dcap: eclib: - '20230424' elfutils: - - 0.189.memfault1 + - 0.189.memfault2 exiv2: - 0.27 expat: @@ -605,6 +605,7 @@ numpy: - 1.22 - 1.22 - 1.23 + - 1.25 occt: - 7.7.2 openblas: @@ -673,12 +674,14 @@ python: - 3.9.* *_cpython - 3.10.* *_cpython - 3.11.* *_cpython + - 3.12.* *_cpython python_impl: # part of a zip_keys: python, python_impl, numpy - cpython - cpython - cpython - cpython + - cpython pytorch: - '2.0' pyqt: diff --git a/gdb-multi-arch/meta.yaml b/gdb-multi-arch/meta.yaml index 9fa5acb..153c742 100644 --- a/gdb-multi-arch/meta.yaml +++ b/gdb-multi-arch/meta.yaml @@ -4,7 +4,7 @@ package: name: {{ name }} - version: {{ version }}.memfault1 + version: {{ version }}.memfault2 source: - url: https://github.com/bminor/binutils-gdb/archive/gdb-{{ version }}-release.tar.gz diff --git a/gdb-xtensa-esp32-elf/conda_build_config.yaml b/gdb-xtensa-esp32-elf/conda_build_config.yaml index e641a2f..4632800 100644 --- a/gdb-xtensa-esp32-elf/conda_build_config.yaml +++ b/gdb-xtensa-esp32-elf/conda_build_config.yaml @@ -327,7 +327,7 @@ dcap: eclib: - '20230424' elfutils: - - 0.189.memfault1 + - 0.189.memfault2 exiv2: - 0.27 expat: @@ -611,6 +611,8 @@ numpy: - 1.21 - 1.21 - 1.21 + - 1.23 + - 1.25 occt: - '7.7' openblas: @@ -674,11 +676,15 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython python_impl: # part of a zip_keys: python, python_impl, numpy - cpython - cpython - cpython + - cpython + - cpython pytorch: - '2.0' pyqt: diff --git a/gdb-xtensa-esp32-elf/meta.yaml b/gdb-xtensa-esp32-elf/meta.yaml index 202d822..e877898 100644 --- a/gdb-xtensa-esp32-elf/meta.yaml +++ b/gdb-xtensa-esp32-elf/meta.yaml @@ -3,7 +3,7 @@ package: name: {{ name }} - version: {{ version }}.memfault4 + version: {{ version }}.memfault5 source: - git_url: https://github.com/espressif/binutils-gdb.git diff --git a/gdb-xtensa-lx106-elf/conda_build_config.yaml b/gdb-xtensa-lx106-elf/conda_build_config.yaml index 18bc1e1..d465825 100644 --- a/gdb-xtensa-lx106-elf/conda_build_config.yaml +++ b/gdb-xtensa-lx106-elf/conda_build_config.yaml @@ -313,7 +313,7 @@ dcap: eclib: - '20230424' elfutils: - - 0.189.memfault1 + - 0.189.memfault2 exiv2: - 0.27 expat: @@ -605,6 +605,7 @@ numpy: - 1.22 - 1.22 - 1.23 + - 1.25 occt: - 7.7.2 openblas: @@ -673,12 +674,14 @@ python: - 3.9.* *_cpython - 3.10.* *_cpython - 3.11.* *_cpython + - 3.12.* *_cpython python_impl: # part of a zip_keys: python, python_impl, numpy - cpython - cpython - cpython - cpython + - cpython pytorch: - '2.0' pyqt: diff --git a/gdb-xtensa-lx106-elf/meta.yaml b/gdb-xtensa-lx106-elf/meta.yaml index cbb149d..7e6f6a2 100644 --- a/gdb-xtensa-lx106-elf/meta.yaml +++ b/gdb-xtensa-lx106-elf/meta.yaml @@ -1,5 +1,5 @@ {% set name = "xtensa-lx106-elf-gdb" %} -{% set version = "11.1_20220318.memfault2" %} +{% set version = "11.1_20220318.memfault3" %} package: name: {{ name }} From 8eb8634a5196e9e927b65e478ab1ae1f54e89e52 Mon Sep 17 00:00:00 2001 From: Noah Pendleton <2538614+noahp@users.noreply.github.com> Date: Tue, 28 May 2024 12:49:04 -0400 Subject: [PATCH 2/3] Fail-fast=false, build multicore --- .github/workflows/build.yml | 2 +- gdb-multi-arch/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44b3164..1ab6a76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: name: 🛠️ build on ${{ matrix.platform }} strategy: - fail-fast: true + fail-fast: false matrix: platform: [ubuntu-20.04, macos-11, macos-13-xlarge] # windows-2022] windows is a bit sad :'( runs-on: ${{ matrix.platform }} diff --git a/gdb-multi-arch/build.sh b/gdb-multi-arch/build.sh index 4fc780d..4a6dd56 100644 --- a/gdb-multi-arch/build.sh +++ b/gdb-multi-arch/build.sh @@ -41,7 +41,7 @@ fi --disable-sim \ --disable-gold \ --enable-64-bit-bfd -make +make -j${CPU_COUNT} make install # Move from the fake to real directory From 77256c862cd0268adcc9bc54350c84aaafb289fc Mon Sep 17 00:00:00 2001 From: Noah Pendleton <2538614+noahp@users.noreply.github.com> Date: Tue, 28 May 2024 12:53:03 -0400 Subject: [PATCH 3/3] Tweak --- gdb-multi-arch/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdb-multi-arch/meta.yaml b/gdb-multi-arch/meta.yaml index 153c742..bcd07cb 100644 --- a/gdb-multi-arch/meta.yaml +++ b/gdb-multi-arch/meta.yaml @@ -51,7 +51,8 @@ requirements: test: commands: - - gdb -ex "print 1" --batch + - gdb --version + - gdb -nx --batch -ex "print 1" about: home: https://www.gnu.org/software/gdb/