Skip to content

Commit ef83e6f

Browse files
authored
Merge pull request #312 from utzcoz/fix-loader-building-with-gradle
Fix loader building with Gradle
2 parents 915196a + c201601 commit ef83e6f

4 files changed

Lines changed: 33 additions & 1 deletion

File tree

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright 2022, Collabora, Ltd.
2+
# SPDX-License-Identifier: CC0-1.0
3+
4+
name: OpenXR Loader for Android - Check
5+
on:
6+
pull_request:
7+
8+
jobs:
9+
build-loader:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Install ninja-build tool
14+
uses: seanmiddleditch/gha-setup-ninja@v3
15+
- name: Set up JDK 11
16+
uses: actions/setup-java@v2
17+
with:
18+
java-version: "11"
19+
distribution: "adopt"
20+
cache: gradle
21+
22+
- name: Build OpenXR Loader with Gradle for Android
23+
run: |
24+
cd src/loader
25+
./gradlew build
26+
- name: Upload OpenXR Loader for Android
27+
uses: actions/upload-artifact@v2
28+
with:
29+
name: OpenXR Loader for Android
30+
path: src/loader/build/outputs/aar/

.github/workflows/android-helloxr-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- name: Install ninja-build tool
1414
uses: seanmiddleditch/gha-setup-ninja@v3
15-
- name: set up JDK 11
15+
- name: Set up JDK 11
1616
uses: actions/setup-java@v2
1717
with:
1818
java-version: "11"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Loader: Fix loader building with Gradle and add CI checking for loader building with Gradle

src/loader/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def registry = "${project.repoRoot}/specification/registry/xr.xml"
4040
// Python is used to generate header files
4141
python {
4242
pip "jinja2:2.10.3"
43+
pip "MarkupSafe:2.0.1"
4344
minPythonVersion = "3.4"
4445

4546
environment = ["PYTHONPATH": scriptDir]

0 commit comments

Comments
 (0)