Enable Experimental builds for Android/Oculus and StandaloneWindows64…

…/SteamVR (#66) * Enable Experimental builds for Android/Oculus and StandaloneWindows64/SteamVR * Add a warning to the README about save files from the experimental builds * Soften the warning * Upload the artifact with a unique name * Replace matrix with explicit lists; Windows regular + experimental wasn't working
icosa-foundation · Mar 25, 2021 · 2f9877c · 2f9877c
1 parent dfb398a
commit 2f9877c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,19 +11,43 @@ env:
 
 jobs:
   build:
-    name: ${{ matrix.targetPlatform }} with ${{ matrix.vrsdk }}
+    name: ${{ matrix.name }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        targetPlatform: [StandaloneWindows64, StandaloneLinux64]
-        vrsdk: [SteamVR, Monoscopic]
+        # We don't use an actual matrix because there's more exceptions than actual cases!
         include:
-          - targetPlatform: StandaloneOSX  # SteamVR was removed in Mar 2020
+          - name: Windows SteamVR
+            targetPlatform: StandaloneWindows64
+            vrsdk: SteamVR
+          - name: Windows SteamVR Experimental
+            targetPlatform: StandaloneWindows64
+            vrsdk: SteamVR
+            extraoptions: -btb-experimental
+          - name: Windows Monoscopic
+            targetPlatform: StandaloneWindows64
             vrsdk: Monoscopic
-          - targetPlatform: Android
+            extraoptions:
+          - name: Linux SteamVR
+            targetPlatform: StandaloneLinux64
+            vrsdk: SteamVR
+          - name: Linux Monoscopic
+            targetPlatform: StandaloneLinux64
+            vrsdk: Monoscopic
+            extraoptions:
+          - name: OSX Monoscopic
+            targetPlatform: StandaloneOSX  # SteamVR was removed in Mar 2020
+            vrsdk: Monoscopic
+          - name: Oculus Quest
+            targetPlatform: Android
             vrsdk: Oculus
             extraoptions: -setDefaultPlatformTextureFormat astc
+          - name: Oculus Quest Experimental
+            targetPlatform: Android
+            vrsdk: Oculus
+            extraoptions: -setDefaultPlatformTextureFormat astc -btb-experimental
+
 
     steps:
       - name: Checkout repository
@@ -157,6 +181,6 @@ jobs:
       - name: Upload build/
         uses: actions/upload-artifact@v2
         with:
-          name: Build-${{ matrix.targetPlatform }}-${{ matrix.vrsdk }}
+          name: ${{ matrix.name }}
           path: build
 
diff --git a/README.md b/README.md
@@ -445,8 +445,10 @@ folder. They are not included in non-experimental builds.
 
 Instead of waiting for a formal release, starting with commit 8a7e51f679fa594a43fc2d7a5ae334acc4e46032, you can download a ZIP file containing the latest build, automatically generated, directly from Github. These versions are believed working and contain code that has undergone a code review, but may not have been fully tested and there is no guarantee as to their quality. However, if you'd like to test a recent change prior to the official release, you can use these either in place of or in parallel with the formal Open Brush releases.
 
-To download a build from the 'tip', go to [commits](https://github.com/icosa-gallery/open-brush/commits/main) and find the commit you want (generally the most recent one on the top). Click on the green check mark below the title (next to the XXX committed XXX ago), and scroll to the build you want, and click on **Details**. Then, towards the upper right corner, click on **Artifacts (6)** and click on the name of the build. Unzip the downloaded file, and either run the executable (Desktop SteamVR/Monoscopic) or install the apk (Android Oculus) using `adb install com.Icosa.OpenBrush-github.apk`.
+To download a build from the "tip", go to [commits](https://github.com/icosa-gallery/open-brush/commits/main) and find the commit you want (generally the most recent one on the top). Click on the green check mark below the title (next to the XXX committed XXX ago), and scroll to the build you want, and click on **Details**. Then, towards the upper right corner, click on **Artifacts (6)** and click on the name of the build. Unzip the downloaded file, and either run the executable (Desktop SteamVR/Monoscopic) or install the apk (Android Oculus) using `adb install com.Icosa.OpenBrush-github.apk`.
 
 These builds share a save location with the official Open Brush release, but can be installed alongside the formal version. The Oculus build, like all sideloaded content, will be listed in "Unknown Sources", and will have the word "Github" appended to the name (with a different package name as well) to differentiate it from the official release).
 
+Note that the "experimental" builds (Windows/SteamVR and Android/Oculus only!) contain experimental brushes, and sketches created using the experimental brushes may appear differently when loaded in the official build of Open Brush!
+
 Note that if you download a Mac OS X build, you'll need to run `xattr -d com.apple.quarantine /path/to/OpenBrush-github.app` prior to be able to launch the app, as it is not signed with Apple developer keys.