Merge pull request #1211 from Ralim/format-to-alpine

Format to alpine
This commit is contained in:
Ben V. Brown
2022-02-05 13:54:10 +11:00
committed by GitHub
2 changed files with 16 additions and 19 deletions

View File

@@ -82,13 +82,19 @@ jobs:
tests:
runs-on: ubuntu-20.04
container:
image: alpine:3.15
steps:
- name: deps
run: apk add --no-cache python3 py3-pip make git bash findutils gcc musl-dev
- uses: actions/checkout@v2
with:
submodules: true
- name: Setup
run: sudo apt-get update && sudo apt-get install -y python3 && pip3 install bdflib
- name: install black
run: python3 -m pip install bdflib
- name: Run python tests
run: cd Translations && chmod +x make_translation_test.py && ./make_translation_test.py
@@ -103,28 +109,19 @@ jobs:
check_formatting:
runs-on: ubuntu-20.04
container:
image: alpine:3.15
steps:
- name: deps
run: apk add --no-cache python3 py3-pip make git
- uses: actions/checkout@v2
with:
submodules: true
- name: chmod
run: chmod +x setup.sh && chmod +x source/build.sh && sudo mkdir -p /build/cache && sudo chmod -R 777 /build
- name: Cached compiler source files
uses: actions/cache@v2.1.7
env:
cache-name: cache-compilers
with:
# we deliberately persist a cache folder forwards
path: /build/cache
key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: |
${{ runner.os }}-
- name: setup
run: sudo apt-get update && sudo apt-get install -y make clang git python3 python3-pip && python3 -m pip install bdflib black flake8
- name: install black
run: python3 -m pip install bdflib black flake8
- name: Check formatting with clang-format
run: cd source && make clean && make check-style

View File

@@ -9,7 +9,7 @@ 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
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
# Install Python3 packages