Skip to content

Commit

Permalink
Merge branch 'main' into acynk/implement-measure-android
Browse files Browse the repository at this point in the history
  • Loading branch information
Latropos authored Aug 14, 2024
2 parents 14742f2 + 250e39b commit bfbe3e6
Show file tree
Hide file tree
Showing 19 changed files with 37 additions and 107 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/babel-plugin-static-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- '.github/workflows/validate-plugin.yml'
- '.github/workflows/babel-plugin-static-check.yml'
- 'packages/react-native-reanimated/plugin/**'
merge_group:
branches:
Expand All @@ -13,7 +13,7 @@ on:
branches:
- main
paths:
- '.github/workflows/validate-plugin.yml'
- '.github/workflows/babel-plugin-static-check.yml'
- 'packages/react-native-reanimated/plugin/**'

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-reanimated-build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- '.github/workflows/docs-check.yml'
- '.github/workflows/docs-reanimated-build-check.yml'
- packages/docs-reanimated/**
merge_group:
branches:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/docs-reanimated-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ on:
push:
branches:
- main
paths: packages/docs-reanimated/**
paths:
- packages/docs-reanimated/**
workflow_dispatch:

jobs:
Expand Down
18 changes: 3 additions & 15 deletions .github/workflows/example-android-build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/android-build.yml
- .github/workflows/example-android-build-check.yml
- packages/react-native-reanimated/android/**
- packages/react-native-reanimated/Common/**
- apps/paper-example/package.json
Expand All @@ -18,7 +18,7 @@ on:
branches:
- main
paths:
- .github/workflows/android-build.yml
- .github/workflows/example-android-build-check.yml
- packages/react-native-reanimated/android/**
- packages/react-native-reanimated/Common/**
- apps/paper-example/package.json
Expand Down Expand Up @@ -47,19 +47,7 @@ jobs:
distribution: 'zulu'
java-version: 17

# TODO: Rework caching in this CI for monorepo setup.
- name: Restore node_modules from cache
uses: actions/cache@v3
with:
path: .
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
restore-keys: ${{ runner.os }}-node-modules-
- name: Restore app node_modules from cache
uses: actions/cache@v3
with:
path: ${{ matrix.working-directory }}/node_modules
key: ${{ runner.os }}-node-modules-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/yarn.lock', matrix.working-directory)) }}
restore-keys: ${{ runner.os }}-node-modules-${{ matrix.working-directory }}-
# TODO: Add caching for node_modules and artifacts that will work with monorepo setup.
- name: Install monorepo node dependencies
run: yarn install --immutable

Expand Down
34 changes: 3 additions & 31 deletions .github/workflows/example-ios-build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/ios-build.yml
- .github/workflows/example-ios-build-check.yml
- packages/react-native-reanimated/RNReanimated.podspec
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/apple/**
Expand All @@ -20,7 +20,7 @@ on:
branches:
- main
paths:
- .github/workflows/ios-build.yml
- .github/workflows/example-ios-build-check.yml
- packages/react-native-reanimated/RNReanimated.podspec
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/apple/**
Expand All @@ -45,43 +45,15 @@ jobs:
- name: Check out Git repository
uses: actions/checkout@v4

# TODO: Rework caching in this CI for monorepo setup.
- name: Restore node_modules from cache
uses: actions/cache@v3
with:
path: .
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
restore-keys: ${{ runner.os }}-node-modules-
- name: Restore app node_modules from cache
uses: actions/cache@v3
with:
path: ${{ matrix.working-directory }}/node_modules
key: ${{ runner.os }}-node-modules-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/yarn.lock', matrix.working-directory)) }}
restore-keys: ${{ runner.os }}-node-modules-${{ matrix.working-directory }}-
- name: Install monorepo node dependencies
run: yarn install --immutable

- name: Restore Pods from cache
uses: actions/cache@v3
with:
path: |
${{ matrix.working-directory }}/ios/Pods
~/Library/Caches/CocoaPods
~/.cocoapods
key: ${{ runner.os }}-pods-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/ios/Podfile.lock', matrix.working-directory)) }}

# TODO: Add caching for node_modules and artifacts that will work with monorepo setup.
- name: Install Pods
working-directory: ${{ matrix.working-directory }}/ios
run: |
bundle install
bundle exec pod install
- name: Restore build artifacts from cache
uses: actions/cache@v3
with:
path: ~/Library/Developer/Xcode/DerivedData
key: ${{ runner.os }}-ios-derived-data-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/ios/Podfile.lock', matrix.working-directory)) }}

- name: Build app
working-directory: ${{ matrix.working-directory }}
run: npx react-native run-ios --no-packager
7 changes: 3 additions & 4 deletions .github/workflows/example-macos-build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/macos-build.yml
- .github/workflows/example-macos-build-check.yml
- packages/react-native-reanimated/RNReanimated.podspec
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/apple/**
Expand All @@ -19,7 +19,7 @@ on:
branches:
- main
paths:
- .github/workflows/macos-build.yml
- .github/workflows/example-macos-build-check.yml
- packages/react-native-reanimated/RNReanimated.podspec
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/apple/**
Expand All @@ -40,8 +40,7 @@ jobs:
steps:
- name: Check out Git repository
uses: actions/checkout@v4

# TODO: Rework caching in this CI for monorepo setup.
# TODO: Add caching for node_modules and artifacts that will work with monorepo setup.
- name: Install monorepo node dependencies
run: yarn install --immutable

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/example-next-build-check-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/build-next-example.yml
- .github/workflows/example-next-build-check-and-test.yml
- 'packages/react-native-reanimated/src/**'
- 'packages/react-native-reanimated/NextExample/**'
push:
Expand Down
38 changes: 4 additions & 34 deletions .github/workflows/example-tvos-build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/tvos-build.yml
- .github/workflows/example-tvos-build-check.yml
- packages/react-native-reanimated/RNReanimated.podspec
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/apple/**
Expand All @@ -18,7 +18,8 @@ on:
branches:
- main
paths:
- .github/workflows/tvos-build.yml

- .github/workflows/example-tvos-build-check.yml
- packages/react-native-reanimated/RNReanimated.podspec
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/apple/**
Expand All @@ -41,52 +42,21 @@ jobs:

- name: Install monorepo node dependencies
run: yarn install --immutable

- name: Restore Reanimated node_modules from cache
uses: actions/cache@v3
with:
path: packages/react-native-reanimated/node_modules
key: ${{ runner.os }}-tvos-node-modules-reanimated-${{ hashFiles('packages/react-native-reanimated/yarn.lock') }}
restore-keys: ${{ runner.os }}-tvos-node-modules-reanimated-

# TODO: Add caching for node_modules and artifacts that will work with monorepo setup.
- name: Install Reanimated node_modules
working-directory: packages/react-native-reanimated
run: yarn install --immutable

- name: Restore app node_modules from cache
uses: actions/cache@v3
with:
path: ${{ env.WORKING_DIRECTORY }}/node_modules
key: ${{ runner.os }}-tvos-node-modules-${{ env.WORKING_DIRECTORY }}-${{ hashFiles(format('{0}/yarn.lock', env.WORKING_DIRECTORY)) }}
restore-keys: ${{ runner.os }}-tvos-node-modules-${{ env.WORKING_DIRECTORY }}-

- name: Install app node_modules
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn install --immutable

- name: Restore Pods from cache
uses: actions/cache@v3
with:
path: |
${{ env.WORKING_DIRECTORY }}/ios/Pods
~/Library/Caches/CocoaPods
~/.cocoapods
key: ${{ runner.os }}-tvos-pods-${{ env.WORKING_DIRECTORY }}-${{ hashFiles(format('{0}/ios/Podfile.lock', env.WORKING_DIRECTORY)) }}

- name: Install Pods
working-directory: ${{ env.WORKING_DIRECTORY }}/ios
run: |
bundle install
bundle exec pod install
- name: Restore build artifacts from cache
uses: actions/cache@v3
with:
path: |
${{ env.WORKING_DIRECTORY }}/ios/build
~/Library/Developer/Xcode/DerivedData
key: ${{ runner.os }}-tvos-build-${{ env.WORKING_DIRECTORY }}-${{ hashFiles(format('{0}/ios/Podfile.lock', env.WORKING_DIRECTORY)) }}

- name: Build app
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn react-native-tvos run-ios --no-packager --scheme TVOSExample-tvOS --simulator "Apple TV"
2 changes: 1 addition & 1 deletion .github/workflows/expo-devclient-build-check-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/check-expo-dev-client-nightly.yml
- .github/workflows/expo-devclient-build-check-nightly.yml
schedule:
- cron: '0 0 * * *' # after publishing new nightly version on NPM
workflow_dispatch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Monorepo app Reanimated build check [Nightly]
on:
pull_request:
paths:
- .github/workflows/build-monorepo.yml
- .github/workflows/build-monorepo-action.yml
- .github/workflows/monorepo-app-reanimated-build-check-nightly.yml
- .github/workflows/monorepo-app-reanimated-build-check-action.yml
- RNReanimated.podspec
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/android/build.gradle
Expand All @@ -14,8 +14,8 @@ on:
branches:
- main
paths:
- .github/workflows/build-monorepo.yml
- .github/workflows/build-monorepo-action.yml
- .github/workflows/monorepo-app-reanimated-build-check-nightly.yml
- .github/workflows/monorepo-app-reanimated-build-check-action.yml
- packages/react-native-reanimated/RNReanimated.podspec
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/android/build.gradle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/check-react-native-nightly.yml
- .github/workflows/react-native-nightly-reanimated-build-check-nightly.yml
schedule:
- cron: '37 19 * * *'
workflow_dispatch:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reanimated-android-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- '.github/workflows/validate-java.yml'
- '.github/workflows/reanimated-android-validation.yml'
- 'packages/react-native-reanimated/android/src/main/java/**'
- 'packages/react-native-reanimated/android/build.gradle'
- 'packages/react-native-reanimated/scripts/cpplint.sh'
Expand All @@ -16,7 +16,7 @@ on:
branches:
- main
paths:
- '.github/workflows/validate-java.yml'
- '.github/workflows/reanimated-android-validation.yml'
- 'packages/react-native-reanimated/android/src/main/java/**'
- 'packages/react-native-reanimated/android/build.gradle'
- 'packages/react-native-reanimated/scripts/cpplint.sh'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reanimated-apple-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on:
branches:
- main
paths:
- '.github/workflows/validate-ios.yml'
- '.github/workflows/reanimated-apple-validation.yml'
- 'packages/react-native-reanimated/apple/**'
- 'packages/react-native-reanimated/package.json'
- 'packages/react-native-reanimated/scripts/validate-apple.sh'
- 'packages/react-native-reanimated/scripts/cpplint.sh'
- 'packages/react-native-reanimated/Common/cpp/**'
pull_request:
paths:
- '.github/workflows/validate-ios.yml'
- '.github/workflows/reanimated-apple-validation.yml'
- 'packages/react-native-reanimated/apple/**'
- 'packages/react-native-reanimated/package.json'
- 'packages/react-native-reanimated/scripts/validate-apple.sh'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reanimated-common-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:
branches:
- main
paths:
- '.github/workflows/validate-cpp.yml'
- '.github/workflows/reanimated-common-validation.yml'
- 'packages/react-native-reanimated/scripts/cpplint.sh'
- 'packages/react-native-reanimated/Common/cpp/**'
pull_request:
paths:
- '.github/workflows/validate-cpp.yml'
- '.github/workflows/reanimated-common-validation.yml'
- 'packages/react-native-reanimated/scripts/cpplint.sh'
- 'packages/react-native-reanimated/Common/cpp/**'
merge_group:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/check-TS-react-native.yml
- .github/workflows/reanimated-typescript-compatibility-test-nightly.yml
schedule:
- cron: '37 19 * * *'
workflow_dispatch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/check-static-framework-nightly.yml
- .github/workflows/static-framework-reanimated-build-nightly.yml
schedule:
- cron: '37 19 * * *'
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/url-validation-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/detect-broken-urls-nightly.yml
- .github/workflows/url-validation-nightly.yml
- packages/react-native-reanimated/scripts/validate-urls.js
schedule:
- cron: '37 19 * * *'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- .github/workflows/build-on-windows-nightly.yml
- .github/workflows/windows-hosted-app-reanimated-build-check-nightly.yml
schedule:
- cron: '37 19 * * *'
workflow_dispatch:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/yarn-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
on:
pull_request:
paths:
- '.github/workflows/validate-yarn.yml'
- '.github/workflows/yarn-validation.yml'
- '**/package.json'
- '**/yarn.lock'
merge_group:
Expand All @@ -14,7 +14,7 @@ on:
branches:
- main
paths:
- '.github/workflows/validate-yarn.yml'
- '.github/workflows/yarn-validation.yml'
- '**/package.json'
- '**/yarn.lock'

Expand Down

0 comments on commit bfbe3e6

Please sign in to comment.