Skip to content

Commit

Permalink
move annotation script and fix validators
Browse files Browse the repository at this point in the history
  • Loading branch information
tjzel committed May 8, 2024
1 parent 079dc5b commit d9f70d8
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 39 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/validate-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ on:
branches:
- main
paths:
- '.github/workflows/validate-cpp.yml'
- 'scripts/cpplint.sh'
- 'Common/cpp/**'
- 'apple/native/**'
- 'android/src/main/cpp/**'
- ".github/workflows/validate-cpp.yml"
- "packages/react-native-reanimated/scripts/cpplint.sh"
- "packages/react-native-reanimated/Common/cpp/**"
- "packages/react-native-reanimated/apple/native/**"
- "packages/react-native-reanimated/android/src/main/cpp/**"
pull_request:
paths:
- '.github/workflows/validate-cpp.yml'
- 'scripts/cpplint.sh'
- 'Common/cpp/**'
- 'apple/native/**'
- 'android/src/main/cpp/**'
- ".github/workflows/validate-cpp.yml"
- "packages/react-native-reanimated/scripts/cpplint.sh"
- "packages/react-native-reanimated/Common/cpp/**"
- "packages/react-native-reanimated/apple/native/**"
- "packages/react-native-reanimated/android/src/main/cpp/**"
merge_group:
branches:
- main
Expand All @@ -36,16 +36,15 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
- name: Install python dependencies
run: |
python -m pip install --upgrade pip
pip install cpplint
- name: Run cpplint
run: |
scripts/cpplint.sh
packages/react-native-reanimated/scripts/cpplint.sh
- name: Disallow DEBUG macros
run: |
! egrep -r '(#if DEBUG|#ifdef DEBUG)' Common/cpp apple android/src/main/cpp
! egrep -r '(#if DEBUG|#ifdef DEBUG)' packages/react-native-reanimated/Common/cpp/ packages/react-native-reanimated/apple/native/ packages/react-native-reanimated/android/src/main/cpp/
24 changes: 14 additions & 10 deletions .github/workflows/validate-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ on:
branches:
- main
paths:
- '.github/workflows/validate-ios.yml'
- 'apple/**'
- 'package.json'
- 'scripts/validate-ios.sh'
- ".github/workflows/validate-ios.yml"
- "packages/react-native-reanimated/apple/**"
- "packages/react-native-reanimated/package.json"
- "packages/react-native-reanimated/scripts/validate-ios.sh"
pull_request:
paths:
- '.github/workflows/validate-ios.yml'
- 'apple/**'
- 'package.json'
- 'scripts/validate-ios.sh'
- ".github/workflows/validate-ios.yml"
- "packages/react-native-reanimated/apple/**"
- "packages/react-native-reanimated/package.json"
- "packages/react-native-reanimated/scripts/validate-ios.sh"
merge_group:
branches:
- main
Expand All @@ -27,7 +27,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: yarn
- name: Install monorepo nodedependencies
run: yarn install
- name: Install Reanimated node dependencies
working-directory: packages/react-native-reanimated
run: yarn install
- name: Lint iOS
working-directory: packages/react-native-reanimated
run: yarn lint:ios
25 changes: 15 additions & 10 deletions .github/workflows/validate-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ env:
on:
pull_request:
paths:
- '.github/workflows/validate-java.yml'
- 'android/src/main/java/**'
- 'android/build.gradle'
- ".github/workflows/validate-java.yml"
- "packages/react-native-reanimated/android/src/main/java/**"
- "packages/react-native-reanimated/android/build.gradle"
merge_group:
branches:
- main
push:
branches:
- main
paths:
- '.github/workflows/validate-java.yml'
- 'android/src/main/java/**'
- 'android/build.gradle'
- ".github/workflows/validate-java.yml"
- "packages/react-native-reanimated/android/src/main/java/**"
- "packages/react-native-reanimated/android/build.gradle"

jobs:
check:
Expand All @@ -31,11 +31,16 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
cache: 'yarn'
cache: "yarn"
- name: Clear annotations
run: scripts/clear-annotations.sh
run: .github/helpers/clear-annotations.sh

- name: Install node dependencies
- name: Install monorepo node dependencies
run: yarn install
- name: Install Reanimated node dependencies
working-directory: packages/react-native-reanimated
run: yarn
- name: Lint

- name: Lint Java
working-directory: packages/react-native-reanimated
run: yarn lint:java
2 changes: 1 addition & 1 deletion .github/workflows/validate-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
with:
cache: "yarn"
- name: Clear annotations
run: scripts/clear-annotations.sh
run: .github/workflows/helper/clear-annotations.sh

- name: Install monorepo dependencies
run: yarn install --immutable
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/validate-yarn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4

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

- name: Get changed files
Expand All @@ -39,7 +38,6 @@ jobs:
files: |
**/package.json
**/yarn.lock
- name: Get list of changed directories
id: changed-dirs
run: |
Expand All @@ -51,7 +49,6 @@ jobs:
done
ECHOLIST=($(echo "${ECHOLIST[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' '))
echo "dirList=${ECHOLIST[*]}" >> $GITHUB_OUTPUT
- name: Perform yarn install in changed directories
working-directory: ${{ github.workspace }}
run: |
Expand Down

0 comments on commit d9f70d8

Please sign in to comment.