From 724b0c49361e8a09e2b2100f29c72075823f1b75 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Fri, 7 Jan 2022 00:04:20 +1100
Subject: [PATCH] Update ci specs

---
 .github/workflows/push.yml | 48 +++++++++++++-------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 7c74d601..b77f4187 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -5,32 +5,24 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-20.04
+    container:
+      image: alpine:3.15
     strategy:
       matrix:
         model: ["TS100", "TS80", "TS80P", "Pinecil", "MHP30"]
       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
+
+      - name: Install dependencies (python)
+        run: python3 -m pip install bdflib
+
       - 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:
-          path: /build/cache
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-          restore-keys: |
-            ${{ runner.os }}-
-
-      - name: setup
-        run: ./setup.sh
-
       - name: build ${{ matrix.model }}
         run: cd source && ./build.sh -m ${{ matrix.model }}
 
@@ -52,32 +44,23 @@ jobs:
 
   build_multi-lang:
     runs-on: ubuntu-20.04
+    container:
+      image: alpine:3.15
     strategy:
       matrix:
         model: ["Pinecil"]
       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
+      - name: Install dependencies (python)
+        run: python3 -m pip install bdflib
+
       - 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:
-          path: /build/cache
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-          restore-keys: |
-            ${{ runner.os }}-
-
-      - name: setup
-        run: ./setup.sh
-
       - name: build ${{ matrix.model }}
         run: cd source && make -j$(nproc) model="${{ matrix.model }}" firmware-multi_compressed_European firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian firmware-multi_Chinese+Japanese
 
@@ -142,6 +125,7 @@ jobs:
 
       - 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: Check formatting with clang-format
         run: cd source && make clean && make check-style