From b81e45f1f6f3075fe549a114d4d8b9f9f612ab11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 13:22:45 +0000 Subject: [PATCH 1/7] Bump actions/upload-artifact from 2 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/release.yml | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0850d615..8cb4db46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,7 +97,7 @@ jobs: msbuild /m /p:Configuration=${{matrix.config}} /p:Platform=${{matrix.platform}} ${{env.SOLUTION_FILE_PATH}} - name: Upload Build outputs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROJECT_NAME }}-Server-${{ matrix.config }} path: ${{ env.SOLUTION_DIR }}\${{ matrix.config }} @@ -201,35 +201,35 @@ jobs: # Upload Artifact Build # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/gvr/debug/ - name: Upload APK Debug - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROJECT_NAME }}-debug-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/gvr/debug/ # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/gvr/release/ - name: Upload APK Release - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROJECT_NAME }}-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/gvr/release/ # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/noGvr/debug/ - name: Upload APK Debug - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROJECT_NAME }}-debug-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/noGvr/debug/ # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/noGvr/release/ - name: Upload APK Release - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROJECT_NAME }}-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/noGvr/release/ - name: Upload Build outputs on failure if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: build-files path: ${{ env.GRADLE_DIR }}/app/.cxx/ @@ -451,7 +451,7 @@ jobs: cat log.txt # build/outputs/connected_android_test_additional_output/gvrDebugAndroidTest/connected/GPlay_Pixel_2_API_30(AVD) - 11/ALVRActivityTest_saveDeviceScreenBitmap.png - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: Test results diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 482b25cf..de6b3323 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,7 +123,7 @@ jobs: run: msbuild /m /p:Configuration=${{matrix.config}} /p:Platform=${{matrix.platform}} ${{env.SOLUTION_FILE_PATH}} - name: Upload Build outputs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROJECT_NAME }}-Server-${{ matrix.config }} path: ${{ env.SOLUTION_DIR }}\${{ matrix.config }} @@ -206,21 +206,21 @@ jobs: # Upload Artifact Build # Noted For Output eg. [MAIN_PROJECT_MODULE]/build/outputs/apk/gvr/debug/ - name: Upload Debug APKs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROJECT_NAME }}-debug-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/**/debug/ # Noted For Output eg. [MAIN_PROJECT_MODULE]/build/outputs/apk/gvr/release/ - name: Upload Release APKs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROJECT_NAME }}-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/**/release/ - name: Upload Build outputs on failure if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: build-files path: ${{ env.GRADLE_DIR }}/app/.cxx/ From 03bd36a4b70e367a501b264d31c754e6e004af2c Mon Sep 17 00:00:00 2001 From: Harsha Raghu Date: Sun, 24 Nov 2024 19:26:26 +0530 Subject: [PATCH 2/7] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8cb4db46..b8f3ad51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,8 +99,8 @@ jobs: - name: Upload Build outputs uses: actions/upload-artifact@v4 with: - name: ${{ env.PROJECT_NAME }}-Server-${{ matrix.config }} - path: ${{ env.SOLUTION_DIR }}\${{ matrix.config }} + name: ${{ env.PROJECT_NAME }}-Server-${{ matrix.config }}-${{ matrix.platform }} + path: ${{ env.SOLUTION_DIR }}\${{ matrix.config }}\${{ matrix.platform }} Build_APK: name: Build Android APK From 8c13700ca1d6536bf2b6eb8202348dd7279da49a Mon Sep 17 00:00:00 2001 From: Harsha Raghu Date: Sun, 24 Nov 2024 19:46:58 +0530 Subject: [PATCH 3/7] fix: remove unnecessary implementation --- code/mobile/android/PhoneVR/app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/code/mobile/android/PhoneVR/app/build.gradle b/code/mobile/android/PhoneVR/app/build.gradle index 3b239e8b..2b7debc1 100644 --- a/code/mobile/android/PhoneVR/app/build.gradle +++ b/code/mobile/android/PhoneVR/app/build.gradle @@ -168,7 +168,6 @@ dependencies { gvrImplementation 'com.google.vr:sdk-base:1.200.0@aar' implementation 'com.google.cardboard.sdk:cardboard-sdk:1.17.0@aar' - implementation 'io.github.zxing-cpp:android:2.2.0-SNAPSHOT' implementation 'com.google.protobuf:protobuf-javalite:3.19.4' implementation 'androidx.camera:camera-core:1.3.4' implementation 'androidx.camera:camera-view:1.3.4' From 20aad805790d130ecf6605ba955acf6635ab63ba Mon Sep 17 00:00:00 2001 From: Harsha Raghu Date: Sun, 24 Nov 2024 20:01:00 +0530 Subject: [PATCH 4/7] Update build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8f3ad51..c9174f09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -203,28 +203,28 @@ jobs: - name: Upload APK Debug uses: actions/upload-artifact@v4 with: - name: ${{ env.PROJECT_NAME }}-debug-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK + name: ${{ env.PROJECT_NAME }}-debug-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }}-gvr-debug APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/gvr/debug/ # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/gvr/release/ - name: Upload APK Release uses: actions/upload-artifact@v4 with: - name: ${{ env.PROJECT_NAME }}-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK + name: ${{ env.PROJECT_NAME }}-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }}-gvr-release APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/gvr/release/ # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/noGvr/debug/ - name: Upload APK Debug uses: actions/upload-artifact@v4 with: - name: ${{ env.PROJECT_NAME }}-debug-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK + name: ${{ env.PROJECT_NAME }}-debug-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }}-nogvr-debug APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/noGvr/debug/ # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/noGvr/release/ - name: Upload APK Release uses: actions/upload-artifact@v4 with: - name: ${{ env.PROJECT_NAME }}-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK + name: ${{ env.PROJECT_NAME }}-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }}-nogvr-release APK path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/noGvr/release/ - name: Upload Build outputs on failure From 3fa2a8ae4a701c69f6508d7e1e2ce85f3c915a8c Mon Sep 17 00:00:00 2001 From: Harsha Raghu Date: Sun, 24 Nov 2024 20:06:51 +0530 Subject: [PATCH 5/7] Update release workflow for manual 8.1 WinSDK installation --- .github/workflows/release.yml | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de6b3323..f492aa44 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,19 +98,28 @@ jobs: run: make format-check # https://github.com/actions/runner-images/issues/842#issuecomment-1495115166 - - name: Install MSVC 2015 (v140) and Windows 8.1 SDK + - name: Install MSVC 2017 (v141) and Windows 8.1 SDK for MSVS2022 shell: powershell run: | + env + $VS_BTOOLS_EXE="vs_buildtools.exe" - $VS_BTOOLS_URI="https://aka.ms/vs/15/release/vs_buildtools.exe" + $VS_BTOOLS_URI="https://aka.ms/vs/17/release/vs_buildtools.exe" Invoke-WebRequest -Uri $VS_BTOOLS_URI -OutFile $VS_BTOOLS_EXE Start-Process -FilePath ./vs_BuildTools.exe -ArgumentList ` - "--add", "Microsoft.VisualStudio.Component.VC.140", ` - "--add", "Microsoft.VisualStudio.Component.Windows81SDK", ` - "--quiet", "--norestart", "--force", "--wait" -Wait -PassThru + "--add", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", ` + "--quiet", "--norestart", "--force", "--wait" -Wait -PassThru -nonewwindow + + # 8.1 SDK is no longer available in latest github-runners and MSVS2022/2019 build tools + # have to download it manually like https://stackoverflow.com/a/77947878 + + Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?LinkId=323507 -OutFile sdk81setup.exe + Start-Process -FilePath ./sdk81setup.exe -ArgumentList "/features +", "/q", "/norestart" -Wait -PassThru -nonewwindow - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2.0.0 + with: + vs-version: '17' - name: Restore NuGet packages working-directory: ${{env.GITHUB_WORKSPACE}} @@ -120,7 +129,14 @@ jobs: working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference - run: msbuild /m /p:Configuration=${{matrix.config}} /p:Platform=${{matrix.platform}} ${{env.SOLUTION_FILE_PATH}} + run: | + env + + $env:VCTargetsPath="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\" + + env + + msbuild /m /p:Configuration=${{matrix.config}} /p:Platform=${{matrix.platform}} ${{env.SOLUTION_FILE_PATH}} - name: Upload Build outputs uses: actions/upload-artifact@v4 From e81eed0563376bb4e5232e733b04b2098542592a Mon Sep 17 00:00:00 2001 From: Harsha Raghu Date: Sun, 24 Nov 2024 20:55:01 +0530 Subject: [PATCH 6/7] Update gradle.properties --- code/mobile/android/PhoneVR/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/mobile/android/PhoneVR/gradle.properties b/code/mobile/android/PhoneVR/gradle.properties index efa05a11..f63d0f17 100644 --- a/code/mobile/android/PhoneVR/gradle.properties +++ b/code/mobile/android/PhoneVR/gradle.properties @@ -11,7 +11,7 @@ # The setting is particularly useful for tweaking memory settings. android.enableJetifier=false android.useAndroidX=true -org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xmx3g # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit From 1deb64b3d3955b89ca13346365e5fb972b3b1d53 Mon Sep 17 00:00:00 2001 From: Harsha Raghu Date: Sun, 24 Nov 2024 22:18:17 +0530 Subject: [PATCH 7/7] Update build.gradle --- code/mobile/android/PhoneVR/app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/code/mobile/android/PhoneVR/app/build.gradle b/code/mobile/android/PhoneVR/app/build.gradle index 2b7debc1..d75adc7d 100644 --- a/code/mobile/android/PhoneVR/app/build.gradle +++ b/code/mobile/android/PhoneVR/app/build.gradle @@ -168,6 +168,7 @@ dependencies { gvrImplementation 'com.google.vr:sdk-base:1.200.0@aar' implementation 'com.google.cardboard.sdk:cardboard-sdk:1.17.0@aar' + implementation 'io.github.zxing-cpp:android:2.3.0-SNAPSHOT' implementation 'com.google.protobuf:protobuf-javalite:3.19.4' implementation 'androidx.camera:camera-core:1.3.4' implementation 'androidx.camera:camera-view:1.3.4'