From fc6a6b79b192e91482931066db9d48265840d793 Mon Sep 17 00:00:00 2001
From: Nathan Friedly <nathan@nfriedly.com>
Date: Wed, 29 Mar 2023 16:22:14 -0400
Subject: [PATCH 1/2] Cleanup build

No functional changes here, just a few housekeeping things:

1) Renamed it to "build.yml" and "Buildroot" since it's responsibilities have now expanded.

2) Got rid of all the caching stuff since we're not using it any more.

3) Updated the upload-artifact action to v3 to resolve the warnings Github was logging about v2 using a deprecated node.js version
---
 .github/workflows/{rootfs.yml => build.yml} | 67 +++------------------
 1 file changed, 10 insertions(+), 57 deletions(-)
 rename .github/workflows/{rootfs.yml => build.yml} (64%)

diff --git a/.github/workflows/rootfs.yml b/.github/workflows/build.yml
similarity index 64%
rename from .github/workflows/rootfs.yml
rename to .github/workflows/build.yml
index bc384c991..ddbaa7add 100644
--- a/.github/workflows/rootfs.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,4 @@
-name: Build Root Filesystem
-
+name: Buildroot
 on:
   push:
   pull_request:
@@ -19,31 +18,8 @@ jobs:
     - uses: actions/checkout@v3
     - if: inputs.submodule
       run: git submodule update --init --depth 1 -- ${{ inputs.submodule }}
-    
-    - name: Generate cache key
-      if: inputs.submodule
-      id: cache-key
-      run: |
-        cd ${{ inputs.submodule }}
-        echo "::set-output name=key::${{ inputs.submodule }}-$(git rev-parse --short HEAD)"
-      
-    - uses: actions/cache@v3
-      if: inputs.submodule
-      with:
-        path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-*.img
-        key: ${{ steps.cache-key.outputs.key }}
-      id: cache
-
-    - name: retrieve ccache
-      uses: actions/cache@v3
-      with:
-        path: ~/.buildroot-ccache
-        key: ${{ inputs.submodule }}-uclibc-ccache-${{ github.sha }}
-        restore-keys: |
-          ${{ inputs.submodule }}-uclibc-ccache-
         
     - name: build
-      #if: steps.cache.outputs.cache-hit != 'true'
       run: |
         cd ${{ inputs.submodule || '.' }}
         #apt update && apt install -y wget unzip build-essential git bc swig libncurses-dev libpython3-dev libssl-dev cpio rsync subversion
@@ -56,25 +32,25 @@ jobs:
         sudo apt update && sudo apt install -y python3-matplotlib python3-numpy
         make graph-build
       
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: build image (uClibc)
         path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-*.img
         if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn`
         
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: SDK (uClibc)
         path: ${{ inputs.submodule || '.' }}/output/images/arm-miyoo-linux-uclibcgnueabi_sdk-buildroot.tar.gz
         if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn`    
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: build-graphs (uClibc)
         path: ${{ inputs.submodule || '.' }}/output/graphs/
         if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn` 
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: rootfs (uClibc)
         path: ${{ inputs.submodule || '.' }}/output/images/rootfs.ext4
@@ -89,30 +65,7 @@ jobs:
     - if: inputs.submodule
       run: git submodule update --init --depth 1 -- ${{ inputs.submodule }}
     
-    - name: Generate cache key
-      if: inputs.submodule
-      id: cache-key
-      run: |
-        cd ${{ inputs.submodule }}
-        echo "::set-output name=key::${{ inputs.submodule }}-$(git rev-parse --short HEAD)"
-      
-    - uses: actions/cache@v3
-      if: inputs.submodule
-      with:
-        path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-*.img
-        key: ${{ steps.cache-key.outputs.key }}
-      id: cache
-
-    - name: retrieve ccache
-      uses: actions/cache@v3
-      with:
-        path: ~/.buildroot-ccache
-        key: ${{ inputs.submodule }}-musl-ccache-${{ github.sha }}
-        restore-keys: |
-          ${{ inputs.submodule }}-musl-ccache-
-
     - name: build
-      #if: steps.cache.outputs.cache-hit != 'true'
       run: |
         cd ${{ inputs.submodule || '.' }}
         #apt update && apt install -y wget unzip build-essential git bc swig libncurses-dev libpython3-dev libssl-dev cpio rsync subversion
@@ -125,26 +78,26 @@ jobs:
         sudo apt update && sudo apt install -y python3-matplotlib python3-numpy
         make graph-build
       
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: build image (musl)
         path: ${{ inputs.submodule || '.' }}/output/images/miyoo-cfw-*.img
         if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn`
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: SDK (musl)
         path: ${{ inputs.submodule || '.' }}/output/images/arm-miyoo-linux-musleabi_sdk-buildroot.tar.gz
         if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn` 
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: build-graphs (musl)
         path: ${{ inputs.submodule || '.' }}/output/graphs/
         if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn` 
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: rootfs (musl)
         path: ${{ inputs.submodule || '.' }}/output/images/rootfs.ext4
-        if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn` 
\ No newline at end of file
+        if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn` 

From d5f813447f6d059cb0ad28812d5c448108b8dc9c Mon Sep 17 00:00:00 2001
From: Nathan Friedly <nathan@nfriedly.com>
Date: Wed, 29 Mar 2023 16:41:44 -0400
Subject: [PATCH 2/2] keep the ccache

---
 .github/workflows/build.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ddbaa7add..239864a22 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,15 @@ jobs:
     - uses: actions/checkout@v3
     - if: inputs.submodule
       run: git submodule update --init --depth 1 -- ${{ inputs.submodule }}
-        
+  
+    - name: retrieve ccache
+      uses: actions/cache@v3
+      with:
+        path: ~/.buildroot-ccache
+        key: ${{ inputs.submodule }}-uclibc-ccache-${{ github.sha }}
+        restore-keys: |
+          ${{ inputs.submodule }}-uclibc-ccache-
+
     - name: build
       run: |
         cd ${{ inputs.submodule || '.' }}
@@ -64,7 +72,15 @@ jobs:
     - uses: actions/checkout@v3
     - if: inputs.submodule
       run: git submodule update --init --depth 1 -- ${{ inputs.submodule }}
-    
+
+    - name: retrieve ccache
+      uses: actions/cache@v3
+      with:
+        path: ~/.buildroot-ccache
+        key: ${{ inputs.submodule }}-musl-ccache-${{ github.sha }}
+        restore-keys: |
+          ${{ inputs.submodule }}-musl-ccache-
+
     - name: build
       run: |
         cd ${{ inputs.submodule || '.' }}