Merge pull request #290 from KhronosGroup/ci

CI
KhronosGroup · Jan 12, 2022 · 7239b01 · 7239b01
2 parents 929c0c5 + 65c6d47
commit 7239b01
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 170 deletions.
diff --git a/.azure-pipelines/shared/build_jobs.yml b/.azure-pipelines/shared/build_jobs.yml
@@ -98,7 +98,9 @@ jobs:
   #         useVulkan: 'true'
 
   - job: combine_artifacts
-    dependsOn: windows_build
+    dependsOn:
+      - generator
+      - windows_build
     condition: ${{ eq(parameters.isSdkSourceRepo, true) }}
     displayName: "Organize artifacts"
     pool:

diff --git a/.github/workflows/OpenXR-SDK-Source/android-release.yml b/.github/workflows/OpenXR-SDK-Source/android-release.yml
@@ -40,6 +40,11 @@ jobs:
         with:
           name: repo
           path: maintainer-scripts/publish-aar/build/repo/
+      - name: Add to release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/release-')
+        with:
+          files: openxr_loader_for_android*
 
   # Hello XR
   build-helloxr-release:

diff --git a/.github/workflows/android-helloxr-ci.yml b/.github/workflows/android-helloxr-ci.yml
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
diff --git a/.github/workflows/android-snapshot.yml b/.github/workflows/android-snapshot.yml