Merge pull request #17 from OpenVicProject/outsource/extras

4 files changed, 4 insertions, 75 deletions

diff --git a/.github/actions/dataloader-build/action.yml b/.github/actions/dataloader-build/action.yml
deleted file mode 100644
index 36caebd..0000000
--- a/.github/actions/dataloader-build/action.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Build OpenVic-Dataloader
-description: Build OpenVic-Dataloader with provided options.
-inputs:
-  target:
-    description: Build target (editor, template_release, template_debug).
-    default: "template_release"
-  platform:
-    description: Target platform.
-    required: false
-  sconsflags:
-    default: ""
-  scons-cache:
-    description: The scons cache path.
-    default: "${{ github.workspace }}/.scons-cache/"
-  scons-cache-limit:
-    description: The scons cache size limit.
-    # actions/cache has 10 GiB limit, and GitHub runners have a 14 GiB disk.
-    # Limit to 7 GiB to avoid having the extracted cache fill the disk.
-    default: 7168
-runs:
-  using: "composite"
-  steps:
-    - name: Scons Build
-      shell: sh
-      env:
-        SCONSFLAGS: ${{ inputs.sconsflags }}
-        SCONS_CACHE: ${{ inputs.scons-cache }}
-        SCONS_CACHE_LIMIT: ${{ inputs.scons-cache-limit }}
-      run: |
-        echo "Building with flags:" platform=${{ inputs.platform }} target=${{ inputs.target }} ${{ env.SCONSFLAGS }}
-        scons platform=${{ inputs.platform }} target=${{ inputs.target }} ${{ env.SCONSFLAGS }}
-        ls -l bin/
diff --git a/.github/actions/dataloader-cache/action.yml b/.github/actions/dataloader-cache/action.yml
deleted file mode 100644
index c913216..0000000
--- a/.github/actions/dataloader-cache/action.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Setup OpenVic-Dataloader Build Cache
-description: Setup OpenVic-Dataloader Build Cache
-inputs:
-  cache-name:
-    description: The cache base name (job name by default).
-    default: "${{github.job}}"
-  scons-cache:
-    description: The scons cache path.
-    default: "${{github.workspace}}/.scons-cache/"
-runs:
-  using: "composite"
-  steps:
-    # Upload cache on completion and check it out now
-    - name: Load .scons_cache directory
-      uses: actions/cache@v3
-      with:
-        path: ${{inputs.scons-cache}}
-        key: ${{inputs.cache-name}}-${{env.OVDL_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-        restore-keys: |
-          ${{inputs.cache-name}}-${{env.OVDL_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-          ${{inputs.cache-name}}-${{env.OVDL_BASE_BRANCH}}-${{github.ref}}
-          ${{inputs.cache-name}}-${{env.OVDL_BASE_BRANCH}}
diff --git a/.github/actions/mingw-cache/action.yml b/.github/actions/mingw-cache/action.yml
deleted file mode 100644
index e92962d..0000000
--- a/.github/actions/mingw-cache/action.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Setup MinGW Cache
-description: Setup MinGW Cache
-inputs:
-   cache-key:
-    description: Name for MinGW cache key.
-    default: "mingw-cache"
-runs:
-  using: "composite"
-  steps:
-    # Upload cache on completion and check it out now
-    - name: Load MinGW Cache
-      id: cache-mingw
-      uses: actions/cache@v3
-      with:
-        path: C:\ProgramData\chocolatey\lib\mingw
-        key: ${{inputs.cache-key}}
-    - name: Setup MinGW for build
-      uses: egor-tensin/setup-mingw@v2
\ No newline at end of file
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 0e0bcfe..e5b02a3 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -64,9 +64,10 @@ jobs:
           submodules: recursive
 
       - name: Setup OpenVic-Dataloader build cache
-        uses: ./.github/actions/dataloader-cache
+        uses: OpenVicProject/openvic-cache@master
         with:
           cache-name: ${{ matrix.identifier }}
+          base-branch: ${{ env.OVDL_BASE_BRANCH }}
         continue-on-error: true
 
       - name: Set up Python
@@ -93,10 +94,10 @@ jobs:
 
       - name: Setup MinGW for Windows/MinGW build
         if: ${{ matrix.platform == 'windows' }}
-        uses: ./.github/actions/mingw-cache
+        uses: OpenVicProject/mingw-cache@master
 
       - name: Compile Dataloader
-        uses: ./.github/actions/dataloader-build
+        uses: OpenVicProject/openvic-build@master
         with:
           platform: ${{ matrix.platform }}
           target: ${{ matrix.target }}