From e19e1a066d4eaf6f116b3cf92677547337f089c3 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sat, 4 Feb 2023 09:30:05 +1100 Subject: [PATCH] Use alpine packaged black Closes #1554 --- .github/workflows/push.yml | 4 ++-- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 6bda0d65..3df90fe4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -140,14 +140,14 @@ jobs: steps: - name: deps - run: apk add --no-cache python3 py3-pip make git + run: apk add --no-cache python3 py3-pip make git black - uses: actions/checkout@v3 with: submodules: true - name: install black - run: python3 -m pip install bdflib black flake8 + run: python3 -m pip install bdflib flake8 - name: Check formatting with clang-format run: cd source && make clean && make check-style diff --git a/Dockerfile b/Dockerfile index d420b12b..7d4f3b84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,11 +9,11 @@ WORKDIR /build # musl-dev is required for the multi lang firmwares # clang is required for clang-format (for dev) -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 musl-dev clang bash clang-extra-tools +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 black make git musl-dev clang bash clang-extra-tools # Install Python3 packages -RUN python3 -m pip install bdflib black +RUN python3 -m pip install bdflib # Git trust RUN git config --global --add safe.directory /build/source