Merge pull request #10 from kodenamekrak/master

1.28.0 and remove old files

.github/workflows/BuildMod.yml

@@ -1,27 +1,18 @@
+# Credit to darknight1050 https://github.com/darknight1050/CrashReporter/blob/master/.github/workflows/build-ndk.yml
+
 name: NDK build
 
+env:
+    module_id: Streamer-Tools
+    qmodName: Streamer Tools
+
 on:
   workflow_dispatch:
   push:
-    branches: [ master, dev ]
-    paths-ignore:
-      - '**.yml'
-      - '!.github/workflows/BuildMod.yml'
-      - '**.json'
-      - '!qpm.json'
-      - '**.ps1'
-      - '!buildQMOD.ps1'
-      - '**.md'
-      - '.gitignore'
+    branches-ignore:
+      - 'version-v*'
   pull_request:
-    branches: [ master, dev ]
 
-env:
-     module_id: Streamer-Tools
-     BSVersion: 1.17.1
-     version: 0.2.2-Dev.${{ github.run_number }}
-     ndkname: android-ndk-r24
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -32,50 +23,13 @@ jobs:
       with:
         submodules: true
         lfs: true
-
+    
     - uses: seanmiddleditch/gha-setup-ninja@v3
 
-    #- name: Install Powershell
-    #  run: sudo apt-get install -y powershell
-
-    #- name: Cache Android NDK
-    #  id: cache-ndk
-    #  uses: actions/cache@v2
-    #  env:
-    #    cache-name: cache-ndk
-    #  with:
-    #    path: ndk
-    #    key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.ndkname }}
-    #    restore-keys: |
-    #      ${{ runner.os }}-${{ env.cache-name }}-${{ env.ndkname }}
-
-    #- name: Install Android NDK
-    #  if: steps.cache-ndk.outputs.cache-hit != 'true'
-    #  run: |
-    #    wget -q -O ndk.zip https://dl.google.com/android/repository/${ndkname}-linux.zip
-    #    unzip -q ndk.zip
-    #    mv ${ndkname} ndk
-
-    #- name: Create ndkpath.txt
-    #  run: |
-    #    cd ndk
-    #    pwd > ${GITHUB_WORKSPACE}/ndkpath.txt
-
     - name: Create ndkpath.txt
       run: |
         echo "$ANDROID_NDK_LATEST_HOME" > ${GITHUB_WORKSPACE}/ndkpath.txt
         cat ${GITHUB_WORKSPACE}/ndkpath.txt
-
-    #- name: Get QPM
-    #  if: steps.cache-qpm.outputs.cache-hit != 'true'
-    #  uses: dawidd6/action-download-artifact@v2
-    #  with:
-    #    github_token: ${{secrets.GITHUB_TOKEN}}
-    #    workflow: main.yml
-    #    name: QPM-ubuntu-x64
-    #    path: QPM
-    #    repo: sc2ad/QuestPackageManager
-
     - name: Get QPM
       if: steps.cache-qpm.outputs.cache-hit != 'true'
       uses: dawidd6/action-download-artifact@v2
@@ -84,80 +38,63 @@ jobs:
         workflow: cargo-build.yml
         name: linux-qpm-rust
         path: QPM
-        repo: RedBrumbler/QuestPackageManager-Rust
+        repo: QuestPackageManager/QPM.CLI
 
     - name: QPM Collapse
       run: |
         chmod +x ./QPM/qpm-rust
         ./QPM/qpm-rust collapse
-
+    
     - name: QPM Dependencies Cache
       id: cache-qpm-deps
       uses: actions/cache@v2
       env:
         cache-name: cache-qpm-deps
       with:
         path: /home/runner/.local/share/QPM-Rust/cache
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('qpm.json', '.github/BuildMod.yml') }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('qpm.json') }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.cache-name }}-
-          ${{ runner.os }}-${{ env.cache-name }}
-      
+          ${{ runner.os }}-build-${{ env.cache-name }}-
+          ${{ runner.os }}-build-
+          ${{ runner.os }}-
     - name: QPM Restore
       run: |
         ./QPM/qpm-rust restore
-
-    - name: Check dependency Folders
+    - name: List Post Restore
       run: |
-        echo "Checking extern includes"
-        ls -lh ${GITHUB_WORKSPACE}/extern/includes
-        echo ""
-        echo "Checking libs"
-        ls -lh ${GITHUB_WORKSPACE}/extern/libs
-        echo ""
-        echo "Checking QPM-Rust/cache Folder"
-        ls -lh $HOME/.local/share/QPM-Rust/cache
-        echo ""
-
+        echo includes:
+        ls -la ${GITHUB_WORKSPACE}/extern/includes
+        echo libs:
+        ls -la ${GITHUB_WORKSPACE}/extern/libs
+        echo cache:
+        ls -la $HOME/.local/share/QPM-Rust/cache
+        
     - name: Build
       run: |
         cd ${GITHUB_WORKSPACE}
-        ./QPM/qpm-rust package edit --version ${{ env.version }}
         ./QPM/qpm-rust qmod build
-        pwsh -Command ./build.ps1 -actions
-
+        pwsh -Command ./build.ps1
+    - name: Create Qmod
+      run: |
+        pwsh -Command ./createqmod.ps1
     - name: Get Library Name
       id: libname
       run: |
         cd ./build/
         pattern="lib${module_id}*.so"
         files=( $pattern )
         echo ::set-output name=NAME::"${files[0]}"
-
-    - name: Package QMOD
-      run: |
-        cd ${GITHUB_WORKSPACE}
-        pwsh -Command ./buildQMOD.ps1 -package
-
-    - name: Upload non-debug artifact
+    
+    - name: Upload so artifact
       uses: actions/upload-artifact@v2
       with:
         name: ${{ steps.libname.outputs.NAME }}
         path: ./build/${{ steps.libname.outputs.NAME }}
         if-no-files-found: error
 
-
-    - name: Upload debug artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: debug_${{ steps.libname.outputs.NAME }}
-        path: ./build/debug/${{ steps.libname.outputs.NAME }}
-        if-no-files-found: error
-
-
-    - name: Upload QMOD
+    - name: Upload qmod artifact
       uses: actions/upload-artifact@v2
       with:
-        name: ${{ env.module_id }}-(UNZIP-for-QMOD).qmod
-        path: ./${{ env.module_id }}_${{ env.version }}.qmod
-        if-no-files-found: warn
+        name: ${{env.qmodName}}.qmod
+        path: ./${{ env.qmodName }}.qmod
+        if-no-files-found: error

.gitignore

@@ -71,4 +71,5 @@ Android.mk.backup
 /log_timestamp
 /build
 *.cmake
+mod.json
 /CMakeSettings.json

.vscode/c_cpp_properties.json

@@ -5,8 +5,8 @@
       "cStandard": "c11",
       "defines": [
         "BS__1_16=1",
-        "ID=\"streamer-tools\"",
-        "VERSION=\"0.1.0\"",
+        "ID=\"#{id}\"",
+        "VERSION=\"#{version}\"",
         "__GNUC__",
         "__aarch64__"
       ],