Namespaces

.clang-format

@@ -2,12 +2,14 @@ BasedOnStyle: Google
 AllowShortBlocksOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: true
-ColumnLimit: 200
+ColumnLimit: 120
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false
 IncludeBlocks: Preserve
-IndentWidth: 4
+IndentWidth: 2
 PointerAlignment: Left
-TabWidth: 4
+TabWidth: 2
 UseTab: Never
-Cpp11BracedListStyle: false
+Cpp11BracedListStyle: false
+QualifierAlignment: Right
+BracedInitializerIndentWidth: 2

.clang-tidy

@@ -0,0 +1,23 @@
+Checks: "clang-diagnostic-*,
+  clang-analyzer-*,
+  fuchsia-statically-constructed-objects,
+  *,
+  -readability-identifier-length,
+  -llvmlibc-*,
+  -llvm-namespace-comment,
+  -llvm-include-order,
+  -altera-*,
+  -fuchsia-*,
+  -modernize-use-trailing-return-type,
+  -cppcoreguidelines-avoid-non-const-global-variables,
+  -llvm-header-guard,
+  -cppcoreguidelines-macro-usage,
+  -cppcoreguidelines-pro-type-vararg,
+  -cppcoreguidelines-avoid-do-while,
+  -hicpp-vararg,
+  -concurrency-mt-unsafe,
+  -modernize-use-using,
+  -abseil-*"
+WarningsAsErrors: true
+HeaderFilterRegex: ""
+FormatStyle: file

.github/workflows/build-android-test.yml

@@ -0,0 +1,66 @@
+on:
+  workflow_dispatch:
+  push:
+    branches-ignore:
+    - "version-*"
+
+env:
+  module_id: flamingo
+  qmodName: flamingo
+
+jobs:
+  build-android-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+        with:
+          submodules: true
+          lfs: true
+
+      - uses: seanmiddleditch/gha-setup-ninja@v3
+
+      - name: Create ndkpath.txt
+        run: |
+          echo "$ANDROID_NDK_LATEST_HOME" > ${GITHUB_WORKSPACE}/ndkpath.txt
+          cat ${GITHUB_WORKSPACE}/ndkpath.txt
+
+      - name: Setup qpm
+        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
+        uses: Fernthedev/qpm-action@v1
+        with:
+          workflow_token: ${{ secrets.GITHUB_TOKEN }}
+          restore: true
+          cache: true
+          publish: false
+
+      - name: QPM Collapse
+        run: qpm-rust collapse
+
+      - name: Build
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          qpm-rust s build-android-test
+
+      - name: Get Library Name
+        id: libname
+        run: |
+          cd ./build/
+          pattern="lib${module_id}*.so"
+          files=( $pattern )
+          echo ::set-output name=NAME::"${files[0]}"
+
+      - name: Upload non-debug artifact
+        uses: actions/upload-artifact@v4
+        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@v4
+        with:
+          name: debug_${{ steps.libname.outputs.NAME }}
+          path: ./build/debug/${{ steps.libname.outputs.NAME }}
+          if-no-files-found: error

.github/workflows/build-ndk.yml

@@ -4,110 +4,158 @@ on:
   workflow_dispatch:
   push:
     branches-ignore:
-    - 'version-*'
-  pull_request:
-    branches-ignore:
-    - 'version-*'
+      - "version-*"
+    tags:
+      - "v*"
 
 env:
-    module_id: flamingo
+  module_id: flamingo
+  qmodName: flamingo
 
 jobs:
+  test-local:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+        with:
+          submodules: true
+
+      - uses: seanmiddleditch/gha-setup-ninja@v3
+
+      - name: Set up Clang
+        uses: egor-tensin/setup-clang@v1
+        with:
+          version: latest
+          platform: x64
+
+      # Get QPM so we can bring in dependencies
+      - name: Setup qpm
+        uses: Fernthedev/qpm-action@v1
+        with:
+          workflow_token: ${{ secrets.GITHUB_TOKEN }}
+          restore: true
+          cache: true
+          publish: false
+
+      - name: QPM Collapse
+        run: qpm collapse
+
+      - name: Run test script
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          ./test.sh
+
   build:
     runs-on: ubuntu-latest
-    
+
     steps:
-    - uses: actions/checkout@v2
-      name: Checkout
-      with:
-        submodules: true
-        lfs: true
-
-    - uses: seanmiddleditch/gha-setup-ninja@v3
-
-    - 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: cargo-build.yml
-        name: linux-qpm-rust
-        path: QPM
-        repo: RedBrumbler/QuestPackageManager-Rust
-
-    - 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 }}-build-${{ env.cache-name }}-${{ hashFiles('qpm.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-
-    - name: QPM Restore
-      run: |
-        ./QPM/qpm-rust restore
-
-    - name: List Post Restore
-      run: |
-        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: Prepare Clang Tidy Suggestions
-      if: ${{ github.event_name == 'pull_request' }}
-      run: cmake -G "Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DTEST_BUILD=1 -B build
-
-    - name: Clang Tidy Suggestions
-      if: ${{ github.event_name == 'pull_request' }}
-      uses: ZedThree/clang-tidy-review@v0.7.0
-      id: review
-      # If there are any comments, don't build
-    - name: Clang Tidy Exit
-      if: ${{ github.event_name == 'pull_request' }} && steps.review.outputs.total_comments > 0
-      run: exit 1
-
-    - name: Build
-      run: |
-        cd ${GITHUB_WORKSPACE}
-        pwsh -Command ./build.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: Upload non-debug 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
+      - uses: actions/checkout@v2
+        name: Checkout
+        with:
+          submodules: true
+          lfs: true
+
+      - uses: seanmiddleditch/gha-setup-ninja@v3
+
+      - name: Create ndkpath.txt
+        run: |
+          echo "$ANDROID_NDK_LATEST_HOME" > ${GITHUB_WORKSPACE}/ndkpath.txt
+          cat ${GITHUB_WORKSPACE}/ndkpath.txt
+
+      # get version from pushed tag
+      - name: Extract version
+        if: startsWith(github.ref, 'refs/tags/v')
+        id: version
+        run: |
+          echo "TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_OUTPUT}
+          echo "VERSION=${GITHUB_REF#refs/tags/v}" >> ${GITHUB_OUTPUT}
+
+      - name: Setup qpm
+        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
+        uses: Fernthedev/qpm-action@v1
+        with:
+          workflow_token: ${{ secrets.GITHUB_TOKEN }}
+          restore: true
+          cache: true
+          publish: false
+
+      # if we have a tag, we are making a qpm release
+      - name: Setup qpm for release
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: Fernthedev/qpm-action@v1
+        with:
+          workflow_token: ${{ secrets.GITHUB_TOKEN }}
+          restore: true
+          cache: true
+          publish: late
+          publish_token: ${{ secrets.QPM_TOKEN }}
+          version: ${{ steps.version.outputs.VERSION }}
+          tag: ${{ steps.version.outputs.TAG }}
+          qpm_release_bin: true
+          qpm_debug_bin: true
+          qpm_qmod: ${{ env.qmodName }}.qmod
+
+      - name: QPM Collapse
+        run: qpm collapse
+
+      - name: Build
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          qpm s build
+
+      - name: Make mod.json
+        run: |
+          qpm qmod manifest
+
+      - name: Build & Create Qmod
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          qpm qmod zip
+
+      - name: Get Library Name
+        id: libname
+        run: |
+          cd ./build/
+          pattern="lib${module_id}*.so"
+          files=( $pattern )
+          echo "NAME=${files[0]}" >> ${GITHUB_OUTPUT}
+
+      - name: Rename debug artifact
+        run: mv "./build/debug/${{ steps.libname.outputs.NAME }}" "./build/debug_${{steps.libname.outputs.NAME }}"
+
+      - name: Upload non-debug artifact
+        uses: actions/upload-artifact@v4
+        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@v4
+        with:
+          name: debug_${{ steps.libname.outputs.NAME }}
+          path: ./build/debug_${{ steps.libname.outputs.NAME }}
+          if-no-files-found: error
+
+      - name: Upload qmod artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{env.qmodName}}.qmod
+          path: ./${{ env.qmodName }}.qmod
+          if-no-files-found: error
+
+      # if we had a tag, we should make a release
+      - name: Upload release artifacts
+        if: startsWith(github.ref, 'refs/tags/v')
+        id: upload_file_release
+        uses: softprops/action-gh-release@v0.1.15
+        with:
+          tag_name: ${{ github.event.inputs.version }}
+          files: |
+            ./build/${{ steps.libname.outputs.NAME }}
+            ./build/debug_${{ steps.libname.outputs.NAME }}
+            ./${{ env.qmodName }}.qmod
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}