From 4905decd614e0571c30c79e1fff8c4712d503c85 Mon Sep 17 00:00:00 2001 From: Khalil Estell Date: Sun, 8 Sep 2024 11:15:01 -0700 Subject: [PATCH] :sparkles: Add GCC 11.3 support --- .github/workflows/12.2.yml | 15 --------------- .github/workflows/12.3.yml | 15 --------------- .github/workflows/deploy.yml | 27 +++++++++++++++++++++++++++ prebuilt/conandata.yml | 3 +++ prebuilt/conanfile.py | 1 + prebuilt/demo/conanfile.py | 3 +-- 6 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 .github/workflows/12.2.yml delete mode 100644 .github/workflows/12.3.yml create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/12.2.yml b/.github/workflows/12.2.yml deleted file mode 100644 index 4ae7413..0000000 --- a/.github/workflows/12.2.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: 🚀 Deploy 12.2 - -on: - workflow_dispatch: - pull_request: - push: - branches: - - main - -jobs: - deploy: - uses: ./.github/workflows/ci.yml - with: - version: "12.2" - secrets: inherit diff --git a/.github/workflows/12.3.yml b/.github/workflows/12.3.yml deleted file mode 100644 index 4016f61..0000000 --- a/.github/workflows/12.3.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: 🚀 Deploy 12.3 - -on: - workflow_dispatch: - pull_request: - push: - branches: - - main - -jobs: - deploy: - uses: ./.github/workflows/ci.yml - with: - version: "12.3" - secrets: inherit diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..27d8c05 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,27 @@ +name: 🚀 Deploy + +on: + workflow_dispatch: + pull_request: + push: + branches: + - main + +jobs: + deploy_11_3: + uses: ./.github/workflows/ci.yml + with: + version: "11.3" + secrets: inherit + + deploy_12_2: + uses: ./.github/workflows/ci.yml + with: + version: "12.2" + secrets: inherit + + deploy_12_3: + uses: ./.github/workflows/ci.yml + with: + version: "12.3" + secrets: inherit diff --git a/prebuilt/conandata.yml b/prebuilt/conandata.yml index 3e33830..032c37e 100644 --- a/prebuilt/conandata.yml +++ b/prebuilt/conandata.yml @@ -1,4 +1,7 @@ sources: + "11.3": + url: "https://github.com/picolibc/picolibc/releases/download/1.7.9/picolibc-1.7.9-11.3.rel1.zip" + sha256: "72577260204bf1b6a223d1e235355e3150fa340456e6d83e48081071a2f46d1a" "12.2": url: "https://github.com/picolibc/picolibc/releases/download/1.8/picolibc-1.8-12.2.rel1.zip" sha256: "e82d41728259edddde2fa7e3eaff1c9ffce6c317841679386e88c043cd5de5e1" diff --git a/prebuilt/conanfile.py b/prebuilt/conanfile.py index 1cfb1d0..2e0b44d 100644 --- a/prebuilt/conanfile.py +++ b/prebuilt/conanfile.py @@ -50,6 +50,7 @@ def package_info(self): self.cpp_info.resdirs = [] short_to_long_version = { + "11.3": "11.3.1", "12.2": "12.2.1", "12.3": "12.3.1", } diff --git a/prebuilt/demo/conanfile.py b/prebuilt/demo/conanfile.py index 90ac4d4..f6b0afa 100644 --- a/prebuilt/demo/conanfile.py +++ b/prebuilt/demo/conanfile.py @@ -9,8 +9,7 @@ class Demo(ConanFile): def build_requirements(self): self.tool_requires("cmake/3.27.1") self.tool_requires( - f"arm-gnu-toolchain/{self.settings.compiler.version}", - options={"custom_libc": True}) + f"arm-gnu-toolchain/{self.settings.compiler.version}") def requirements(self): self.requires(f"prebuilt-picolibc/{self.settings.compiler.version}")