Skip to content

Commit

Permalink
missing android files
Browse files Browse the repository at this point in the history
  • Loading branch information
CedricGuillemet committed Sep 26, 2024
1 parent 36d856f commit c07cedf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
with:
release-version: 0.0.${GITHUB_SHA::8}

build-windows-rnta:
windows-rnta:
runs-on: windows-2019
strategy:
matrix:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
7 changes: 3 additions & 4 deletions Package/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit c07cedf

Please sign in to comment.