diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 241a3051..c6ff0bf2 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -50,7 +50,7 @@ jobs: # env: # JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} - build-upload-android-ios-rnta: + android-ios-rnta: runs-on: macos-latest strategy: matrix: @@ -108,7 +108,7 @@ jobs: with: release-version: 0.0.${GITHUB_SHA::8} - build-windows-rnta: + windows-rnta: runs-on: windows-2019 strategy: matrix: @@ -171,7 +171,7 @@ jobs: working-directory: ./Apps/BRNPlayground/windows publish-react-native: - needs: [build-typescript, build-upload-android-ios-rnta] + needs: [build-typescript, android-ios-rnta] runs-on: macos-latest strategy: matrix: @@ -198,7 +198,7 @@ jobs: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} publish-react-native-iosandroid: - needs: [build-typescript, build-upload-android-ios-rnta] + needs: [build-typescript, android-ios-rnta] runs-on: macos-latest strategy: matrix: diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 51d850c3..e86dc75c 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -440,8 +440,8 @@ const validateAssembledAndroid = async () => { let expectedandroid = [ `${assemblediOSAndroidDir}/android`, `${assemblediOSAndroidDir}/android/build.gradle`, - `${assemblediOSAndroidDir}/android/include`, - `${assemblediOSAndroidDir}/android/include/IXrContextARCore.h`, + //`${assemblediOSAndroidDir}/android/include`, + //`${assemblediOSAndroidDir}/android/include/IXrContextARCore.h`, WHY? `${assemblediOSAndroidDir}/android/src`, `${assemblediOSAndroidDir}/android/src/main`, `${assemblediOSAndroidDir}/android/src/main/AndroidManifest.xml`, @@ -639,7 +639,6 @@ const patchPackageVersion = async () => { const copyFiles = gulp.parallel(copyIOSAndroidCommonFiles, copyIOSFiles, copyAndroidFiles); -const copyFilesAndroid = gulp.parallel(copyAndroidFiles); const copyFilesiOS = gulp.parallel(copyIOSAndroidCommonFiles, copyIOSFiles); const buildTS = gulp.series(patchPackageVersion, copyCommonFiles, copySharedFiles, buildTypeScript, validateAssembled); @@ -648,7 +647,7 @@ const buildIOSAndroid = gulp.series(patchPackageVersion, buildIOS, buildAndroid, const build = gulp.series(buildIOSAndroid, switchToBaseKit, buildIOSAndroid); -const _buildAndroidRNTA = gulp.series(patchPackageVersion, buildAndroidRNTA, copyFilesAndroid, validateAssembledAndroid); +const _buildAndroidRNTA = gulp.series(patchPackageVersion, buildAndroidRNTA, copyAndroidFiles, validateAssembledAndroid); const _buildIOSRNTA = gulp.series(patchPackageVersion, buildIOSRNTA, createIOSUniversalLibs, copyFilesiOS, validateAssemblediOS); const buildRNTAandroid = gulp.series(enableRNTA, _buildAndroidRNTA, switchToBaseKit, _buildAndroidRNTA);