From 504d96a0f338d10790938ce867f1be78425c9f4d Mon Sep 17 00:00:00 2001
From: Dean Netherton <dinoboards@netherton.org>
Date: Thu, 31 Oct 2024 21:26:10 +1100
Subject: [PATCH] apps: github action workflow downloads clang-tool-chain tar
 and installs compiler

---
 .github/workflows/clang-tool-chain.yml | 47 --------------------------
 .github/workflows/ez80-for-rc.yml      | 18 +++++++++-
 apps/Makefile                          |  2 +-
 3 files changed, 18 insertions(+), 49 deletions(-)
 delete mode 100644 .github/workflows/clang-tool-chain.yml

diff --git a/.github/workflows/clang-tool-chain.yml b/.github/workflows/clang-tool-chain.yml
deleted file mode 100644
index e6475c9..0000000
--- a/.github/workflows/clang-tool-chain.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: clang-tool-chain
-
-on:
-  push:
-    branches:
-      - '**'
-    tags:
-      - '**'
-    paths:
-      - 'clang-tool-chain/**'
-      - .github/workflows/clang-tool-chain.yml
-
-jobs:
-  clang-tool-chain:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: pull previous version to get docker layers
-        run: |
-          docker pull ubuntu:focal-20240530
-          docker pull dinoboards/llvmez80-platform:0.0.4
-          docker pull dinoboards/llvmez80-builder:0.0.4
-          docker pull dinoboards/llvmez80:0.0.4
-
-      - name: build clang within docker image
-        working-directory: clang-tool-chain
-        run: |
-          ./build-docker.sh
-
-      - name: Zip tools
-        uses: actions/upload-artifact@v4
-        with:
-          name: ez80-clang-direct
-          path: |
-            tmp/direct
-
-      - name: Zip docker shim tools
-        uses: actions/upload-artifact@v4
-        with:
-          name: ez80-clang-docker
-          path: |
-            tmp/docker
diff --git a/.github/workflows/ez80-for-rc.yml b/.github/workflows/ez80-for-rc.yml
index 5a57452..8e668cf 100644
--- a/.github/workflows/ez80-for-rc.yml
+++ b/.github/workflows/ez80-for-rc.yml
@@ -136,9 +136,25 @@ jobs:
         run: |
           docker pull z88dk/z88dk
 
+      - name: install ez80-clang
+        run: |
+          wget --progress=dot:giga https://github.com/dinoboards/ez80-clang/releases/download/v0.0.5/ez80-clang-0.0.5.tar.gz
+          tar -xzvf ez80-clang-0.0.5.tar.gz
+          cd ez80-clang-0.0.5
+          sudo ./install.sh
+          source /home/runner/.ez80-clang
+
       - name: build apps
         working-directory: apps
-        run: make
+        run: |
+          source /home/runner/.ez80-clang
+          env
+          which ez80-clang
+          ls -larts /opt/ez80-clang/bin
+          ez80-clang --version
+          /opt/ez80-clang/bin/ez80-clang --version
+          /opt/ez80-clang/bin/clang-15 --version
+          make
 
       - name: Archive apps
         uses: actions/upload-artifact@v4
diff --git a/apps/Makefile b/apps/Makefile
index ddc120c..ffde49f 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -3,7 +3,7 @@ BIN=./bin/
 MAKEFLAGS += --no-print-directory
 
 # Define the binaries
-BINARIES := MATRIX8 I2CSCAN DHRY WHET FWUPDATE FWMAIN FWSTATUS EZ80 HELLO-WORLD-Z80 HELLO-WORLD-ADL MBROT
+BINARIES := EZ80 HELLO-WORLD-Z80 HELLO-WORLD-ADL MBROT MATRIX8 I2CSCAN DHRY WHET FWUPDATE FWMAIN FWSTATUS
 
 # Default target
 all: $(BINARIES:%=$(BIN)%.COM)