From acf13bb4f41ae56b35d1d9ff4508e91ad4f4a49b Mon Sep 17 00:00:00 2001
From: Xargon Wan <xargonwan@gmail.com>
Date: Sat, 30 Apr 2022 17:40:28 +0900
Subject: [PATCH] New workflow: different approach

---
 .github/workflows/cooker.yml | 58 ++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml
index 040669f8..34c1cfa8 100644
--- a/.github/workflows/cooker.yml
+++ b/.github/workflows/cooker.yml
@@ -17,27 +17,27 @@ on:
 
 jobs:
 
-  Job1_-_Prepearing_enviornment:
-    runs-on: ubuntu-latest
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-      - name: Prepearing enviornment
-        run: |
-          git submodule init
-          git submodule update
-          sudo add-apt-repository ppa:alexlarsson/flatpak
-          sudo apt-get update
-          sudo apt install flatpak flatpak-builder p7zip-full
-          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
+  # Job1_-_Prepearing_enviornment:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+  #     - uses: actions/checkout@v3
+  #     - name: Prepearing enviornment
+  #       run: |
+  #         git submodule init
+  #         git submodule update
+  #         sudo add-apt-repository ppa:alexlarsson/flatpak
+  #         sudo apt-get update
+  #         sudo apt install flatpak flatpak-builder p7zip-full
+  #         sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+  #         sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
 
-      - name: cache-cooker
-        id: cache-cooker
-        uses: actions/cache@v2
-        with:
-          path: /
-          key: ${{ runner.os }}-cache
+  #     - name: cache-cooker
+  #       id: cache-cooker
+  #       uses: actions/cache@v2
+  #       with:
+  #         path: ./*flatpak*
+  #         key: ${{ runner.os }}-cache
 
   Job2_-_Downloading_Sources:
     runs-on: ubuntu-latest
@@ -46,13 +46,20 @@ jobs:
       - name: Downloading sources
         if: steps.cache-cooker.outputs.cache-hit != 'true'
         run: |
+          git submodule init
+          git submodule update
+          sudo add-apt-repository ppa:alexlarsson/flatpak
+          sudo apt-get update
+          sudo apt install flatpak flatpak-builder p7zip-full
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
           sudo flatpak-builder --download-only --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml
 
       - name: cache-cooker
         id: cache-cooker
         uses: actions/cache@v2
         with:
-          path: /
+          path: ./*flatpak*
           key: ${{ runner.os }}-cache
 
   Job3_-_Building_part_1:
@@ -62,13 +69,20 @@ jobs:
       - name: Bulding part 1 - Until RetroArch Cores
         if: steps.cache-cooker.outputs.cache-hit != 'true'
         run: |
+          git submodule init
+          git submodule update
+          sudo add-apt-repository ppa:alexlarsson/flatpak
+          sudo apt-get update
+          sudo apt install flatpak flatpak-builder p7zip-full
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
           sudo flatpak-builder --build-only --stop-at=retroarch-cores --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml
 
       - name: cache-cooker
         id: cache-cooker
         uses: actions/cache@v2
         with:
-          path: /
+          path: ./*flatpak*
           key: ${{ runner.os }}-cache
 
   Job4_-_Building_part_2: