From 849d1f7d40182c3b67426da75bd261e38a4cd02f Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" <5425387+Ralim@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:54:47 +1100 Subject: [PATCH] Update compilers (#1858) * Update Alpine Image * Update push.yml * Style updates --- .github/workflows/push.yml | 44 ++++++++++--------- scripts/IronOS.Dockerfile | 11 ++--- source/Core/BSP/MHP30/system_stm32f1xx.c | 2 +- source/Core/BSP/Miniware/Setup.cpp | 8 ++-- source/Core/BSP/Miniware/system_stm32f1xx.c | 2 +- .../OS/FreeRTOS/Source/portable/GCC/port.c | 2 +- source/Core/BSP/Pinecilv2/ble_peripheral.c | 4 +- source/Core/BSP/Sequre_S60/system_stm32f1xx.c | 2 +- source/Makefile | 4 +- 9 files changed, 40 insertions(+), 39 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f07c4ae1a9..ae6e2a8bc7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -3,23 +3,31 @@ name: CI on: [push, pull_request] jobs: - - build: runs-on: ubuntu-20.04 container: - image: alpine:3.16 + image: alpine:3.19 strategy: matrix: - model: ["TS100", "TS80", "TS80P", "Pinecil", "MHP30", "Pinecilv2", "S60", "TS101"] + model: + [ + "TS100", + "TS80", + "TS80P", + "Pinecil", + "MHP30", + "Pinecilv2", + "S60", + "TS101", + ] fail-fast: true steps: - name: Install dependencies (apk) - run: apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash + run: apk add --no-cache gcc-riscv-none-elf g++-riscv-none-elf gcc-arm-none-eabi g++-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash - name: Install dependencies (python) - run: python3 -m pip install bdflib + run: python3 -m pip install --break-system-packages bdflib - uses: actions/checkout@v4 with: @@ -58,11 +66,10 @@ jobs: name: metadata path: source/Hexfile/${{ matrix.model }}.json - build_multi-lang: runs-on: ubuntu-20.04 container: - image: alpine:3.16 + image: alpine:3.19 strategy: matrix: model: ["Pinecil", "Pinecilv2"] @@ -70,9 +77,9 @@ jobs: steps: - name: Install dependencies (apk) - run: apk add --no-cache gcc-riscv-none-elf newlib-riscv-none-elf findutils python3 py3-pip make git bash musl-dev + run: apk add --no-cache gcc-riscv-none-elf g++-riscv-none-elf gcc-arm-none-eabi g++-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash musl-dev - name: Install dependencies (python) - run: python3 -m pip install bdflib + run: python3 -m pip install --break-system-packages bdflib - uses: actions/checkout@v4 with: @@ -111,11 +118,10 @@ jobs: name: metadata path: source/Hexfile/${{ matrix.model }}_multi-lang.json - tests: runs-on: ubuntu-20.04 container: - image: alpine:3.16 + image: alpine:3.19 steps: - name: Install dependencies (apk) @@ -126,7 +132,7 @@ jobs: submodules: true - name: Install dependencies (python) - run: python3 -m pip install bdflib + run: python3 -m pip install --break-system-packages bdflib - name: Run python tests run: ./Translations/make_translation_test.py @@ -134,11 +140,10 @@ jobs: - name: Run BriefLZ tests run: make -C source/ Objects/host/brieflz/libbrieflz.so && ./Translations/brieflz_test.py - check_c-cpp: runs-on: ubuntu-20.04 container: - image: alpine:3.16 + image: alpine:3.19 steps: - name: Install dependencies (apk) @@ -151,11 +156,10 @@ jobs: - name: Check format style with clang-format run: make clean check-style - check_python: runs-on: ubuntu-20.04 container: - image: alpine:3.16 + image: alpine:3.19 steps: - name: Install dependencies (apk) @@ -166,7 +170,7 @@ jobs: submodules: true - name: Install dependencies (python) - run: python3 -m pip install bdflib flake8 + run: python3 -m pip install --break-system-packages bdflib flake8 - name: Check python formatting with black run: black --check Translations @@ -174,7 +178,6 @@ jobs: - name: Check python with flake8 run: flake8 Translations - check_shell: name: check_shell runs-on: ubuntu-latest @@ -188,11 +191,10 @@ jobs: exclude: "./.git/*" # Optional. check_all_files_with_shebangs: "false" # Optional. - check_readme: runs-on: ubuntu-20.04 container: - image: alpine:3.16 + image: alpine:3.19 steps: - name: Install dependencies (apk) diff --git a/scripts/IronOS.Dockerfile b/scripts/IronOS.Dockerfile index 8da2e4af37..2c33940889 100644 --- a/scripts/IronOS.Dockerfile +++ b/scripts/IronOS.Dockerfile @@ -1,6 +1,7 @@ # Default Reference Distro for development env & deploy: -# * Alpine Linux, version 3.16 * -FROM alpine:3.16 +# * Alpine Linux, version 3.19 * + +FROM alpine:3.19 LABEL maintainer="Ben V. Brown " # Default current dir when container starts @@ -14,7 +15,7 @@ WORKDIR /build/ironos ## - clang (required for clang-format to check C++ code formatting) ## - shellcheck (to check sh scripts) -ARG APK_COMPS="gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi" +ARG APK_COMPS="gcc-riscv-none-elf g++-riscv-none-elf gcc-arm-none-eabi g++-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi" ARG APK_PYTHON="python3 py3-pip black" ARG APK_MISC="findutils make git diffutils zip" ARG APK_DEV="musl-dev clang bash clang-extra-tools shellcheck" @@ -25,8 +26,8 @@ ARG PIP_PKGS='bdflib flake8 pymdown-extensions mkdocs mkdocs-autolinks-plugin mk # Install system packages using alpine package manager RUN apk add --no-cache ${APK_COMPS} ${APK_PYTHON} ${APK_MISC} ${APK_DEV} -# Install Python3 packages as modules using pip -RUN python3 -m pip install ${PIP_PKGS} +# Install Python3 packages as modules using pip, yes we dont care if packages break +RUN python3 -m pip install --break-system-packages ${PIP_PKGS} # Git trust to avoid related warning RUN git config --global --add safe.directory /build/ironos diff --git a/source/Core/BSP/MHP30/system_stm32f1xx.c b/source/Core/BSP/MHP30/system_stm32f1xx.c index e950ea24e7..944abbccc4 100644 --- a/source/Core/BSP/MHP30/system_stm32f1xx.c +++ b/source/Core/BSP/MHP30/system_stm32f1xx.c @@ -83,7 +83,7 @@ void SystemInit(void) { #ifdef VECT_TAB_SRAM SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ #else - SCB->VTOR = FLASH_BASE | 0x8000; /* Vector Table Relocation in Internal FLASH. */ + SCB->VTOR = FLASH_BASE | 0x8000; /* Vector Table Relocation in Internal FLASH. */ #endif } diff --git a/source/Core/BSP/Miniware/Setup.cpp b/source/Core/BSP/Miniware/Setup.cpp index f4895170b4..3f0702a433 100644 --- a/source/Core/BSP/Miniware/Setup.cpp +++ b/source/Core/BSP/Miniware/Setup.cpp @@ -317,7 +317,7 @@ static void MX_TIP_CONTROL_TIMER_Init(void) { #ifdef TIP_HAS_DIRECT_PWM sConfigOC.Pulse = 0; // PWM is direct to tip #else - sConfigOC.Pulse = 127; // 50% duty cycle, that is AC coupled through the cap to provide an on signal (This does not do tip at 50% duty cycle) + sConfigOC.Pulse = 127; // 50% duty cycle, that is AC coupled through the cap to provide an on signal (This does not do tip at 50% duty cycle) #endif sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH; sConfigOC.OCFastMode = TIM_OCFAST_ENABLE; @@ -336,7 +336,7 @@ static void MX_TIP_CONTROL_TIMER_Init(void) { // Remap TIM3_CH1 to be on PB4 __HAL_AFIO_REMAP_TIM3_PARTIAL(); #else - // No re-map required + // No re-map required #endif HAL_TIM_PWM_Start(&htimTip, PWM_Out_CHANNEL); } @@ -480,8 +480,8 @@ static void MX_GPIO_Init(void) { HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); #endif #else - /* TS80 */ - /* Leave USB lines open circuit*/ + /* TS80 */ + /* Leave USB lines open circuit*/ #endif diff --git a/source/Core/BSP/Miniware/system_stm32f1xx.c b/source/Core/BSP/Miniware/system_stm32f1xx.c index 2fd8e60e5f..06c843e06b 100644 --- a/source/Core/BSP/Miniware/system_stm32f1xx.c +++ b/source/Core/BSP/Miniware/system_stm32f1xx.c @@ -86,7 +86,7 @@ void SystemInit(void) { #ifdef VECT_TAB_SRAM SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ #else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ #endif } diff --git a/source/Core/BSP/Pinecil/Vendor/OS/FreeRTOS/Source/portable/GCC/port.c b/source/Core/BSP/Pinecil/Vendor/OS/FreeRTOS/Source/portable/GCC/port.c index a20833aab9..0d4b93ea7a 100644 --- a/source/Core/BSP/Pinecil/Vendor/OS/FreeRTOS/Source/portable/GCC/port.c +++ b/source/Core/BSP/Pinecil/Vendor/OS/FreeRTOS/Source/portable/GCC/port.c @@ -34,7 +34,7 @@ #include "task.h" #include -//#define ENABLE_KERNEL_DEBUG +// #define ENABLE_KERNEL_DEBUG #ifdef ENABLE_KERNEL_DEBUG #define FREERTOS_PORT_DEBUG(...) printf(__VA_ARGS__) diff --git a/source/Core/BSP/Pinecilv2/ble_peripheral.c b/source/Core/BSP/Pinecilv2/ble_peripheral.c index 1cbf4ba1be..cc3a030f58 100644 --- a/source/Core/BSP/Pinecilv2/ble_peripheral.c +++ b/source/Core/BSP/Pinecilv2/ble_peripheral.c @@ -258,9 +258,7 @@ static struct bt_gatt_attr ble_attrs_declaration[] = { NAME get_attr */ -struct bt_gatt_attr *get_attr(u8_t index) { - return &ble_attrs_declaration[index]; -} +struct bt_gatt_attr *get_attr(u8_t index) { return &ble_attrs_declaration[index]; } static struct bt_gatt_service ble_tp_server = BT_GATT_SERVICE(ble_attrs_declaration); diff --git a/source/Core/BSP/Sequre_S60/system_stm32f1xx.c b/source/Core/BSP/Sequre_S60/system_stm32f1xx.c index 5be70b6f3a..f6c0db93bc 100644 --- a/source/Core/BSP/Sequre_S60/system_stm32f1xx.c +++ b/source/Core/BSP/Sequre_S60/system_stm32f1xx.c @@ -85,7 +85,7 @@ void SystemInit(void) { #ifdef VECT_TAB_SRAM SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ #else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ + SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ #endif } diff --git a/source/Makefile b/source/Makefile index d1c123a87b..de352c5f39 100644 --- a/source/Makefile +++ b/source/Makefile @@ -334,7 +334,7 @@ flash_size=128k bootldr_size=0x0 # Flags -CPUFLAGS=-march=rv32imac \ +CPUFLAGS=-march=rv32imaczicsr \ -mabi=ilp32 \ -mcmodel=medany \ -fsigned-char \ @@ -410,7 +410,7 @@ LDSCRIPT=./Core/BSP/Pinecilv2/bl_mcu_sdk/drivers/bl702_driver/bl702_flash.ld DEVICE_DFU_ADDRESS=0x23000000 # DFU starts at the beginning of flash # Flags -CPUFLAGS=-march=rv32imafc \ +CPUFLAGS=-march=rv32imafczicsr \ -mabi=ilp32f \ -mcmodel=medany \ -fsigned-char \