Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support native 4.2.6 #735

Merged
merged 11 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@ runs:
with:
node-version-file: .nvmrc

- name: Setup Ruby
if: ${{ runner.os == 'macOS' }}
uses: ruby/setup-ruby@v1
with:
bundler-cache: true

- name: Setup activesupport
if: ${{ runner.os == 'macOS' }}
run:
gem install activesupport -v 7.0.8
shell: bash

- name: Setup Cocoapods
if: ${{ runner.os == 'macOS' }}
uses: maxim-lobanov/setup-cocoapods@v1
with:
version: 1.13.0

- name: Cache dependencies
id: yarn-cache
uses: actions/cache@v3
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
turbo_cache_hit: 0
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand Down Expand Up @@ -78,6 +78,7 @@ jobs:
name: AgoraRtcNgExample
path: |
example/android/app/build/outputs/apk/release/*.apk
if-no-files-found: error

build-ios:
if: ${{ contains(github.event.pull_request.labels.*.name, 'ci:dep-update') }}
Expand All @@ -87,15 +88,14 @@ jobs:
turbo_cache_hit: 0
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup

- name: Setup cocoapods
- name: Setup fastlane
run: |
gem install cocoapods -v 1.13.0
gem install activesupport -v 7.0.8
brew install fastlane

- name: Cache turborepo for iOS
uses: actions/cache@v3
Expand Down Expand Up @@ -174,17 +174,19 @@ jobs:
name: AgoraRtcNgExample
path: |
example/ios/*.ipa
if-no-files-found: error

- name: Upload dSYM
uses: actions/upload-artifact@v3
with:
name: AgoraRtcNgExampleSymbol
path: |
example/ios/*.dSYM.zip
if-no-files-found: error

notification:
runs-on: ubuntu-latest
needs: [ build-android, build-ios ]
steps:
- run: |
curl -X POST "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${{ secrets.WECHAT_KEY }}" -d '{"msgtype":"text","text":{"content":"ReactNative:\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}}'
curl -X POST "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${{ secrets.WECHAT_KEY }}" -d '{"msgtype":"text","text":{"content":"ReactNative Example:\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\nDownload Link:\nhttps://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}"}}'
15 changes: 5 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ${{ matrix.platform }}-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -39,7 +39,7 @@ jobs:
runs-on: ${{ matrix.platform }}-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -54,7 +54,7 @@ jobs:
runs-on: ${{ matrix.platform }}-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -73,7 +73,7 @@ jobs:
turbo_cache_hit: 0
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand Down Expand Up @@ -154,16 +154,11 @@ jobs:
turbo_cache_hit: 0
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup

- name: Setup cocoapods
run: |
gem install cocoapods -v 1.13.0
gem install activesupport -v 7.0.8

- name: Cache turborepo for iOS
uses: actions/cache@v3
with:
Expand Down
38 changes: 37 additions & 1 deletion .github/workflows/dep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand Down Expand Up @@ -46,3 +46,39 @@ jobs:
Dependencies content:

${{ steps.dep.outputs.matches }}

update-pod:
runs-on: macos-latest
needs: update-dependencies
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}-dep-update
token: ${{ secrets.GH_TOKEN }}

- name: Setup
uses: ./.github/actions/setup

- name: Cache cocoapods
id: cocoapods-cache
uses: actions/cache@v3
with:
path: |
**/ios/Pods
key: ${{ runner.os }}-cocoapods-0-${{ hashFiles('example/ios/Podfile.lock') }}
restore-keys: |
${{ runner.os }}-cocoapods-0-

- name: Update Podfile.lock
run: |
pod update
working-directory: example/ios

- name: Commit changes
run: |
git config --global user.email "${{ secrets.GIT_EMAIL }}"
git config --global user.name "${{ secrets.GIT_USERNAME }}"
git add example
git commit -m "chore(example): update Podfile.lock by new dependencies"
git push
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gitleaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: gitleaks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: gitleaks/gitleaks-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/terra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -38,7 +38,7 @@ jobs:

- name: Generate ts interface
run: |
yarn
yarn build:ts-interface

- name: Generate comments
uses: ./.github/actions/doc
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/typedoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,39 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup

- name: Build TypeDoc
run: yarn doc

- name: Zip It Up 🤐
run: |
zip -r react-native-agora-docs.zip docs

- name: Upload Artifact ⬆️
uses: actions/upload-artifact@v3
with:
name: react-native-agora-docs.zip
path: react-native-agora-docs.zip
if-no-files-found: error

- name: Upload Doc Archive to GitHub release ⬆️
if: github.event.release
uses: svenstaro/upload-release-action@2.6.0
with:
file: react-native-agora-docs.zip
asset_name: react-native-agora-docs.zip
tag: ${{ github.ref_name }}

- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v2
with:
# Upload docs directory
path: 'docs'

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v2
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ dependencies {
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+"
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
api 'io.agora.rtc:full-sdk:4.2.3'
implementation 'io.agora.rtc:full-screen-sharing:4.2.3'
implementation 'io.agora.rtc:iris-rtc:4.2.3-build.4'
api 'io.agora.rtc:full-sdk:4.2.6'
implementation 'io.agora.rtc:full-screen-sharing:4.2.6'
implementation 'io.agora.rtc:iris-rtc:4.2.6-build.3'
}

if (isNewArchitectureEnabled()) {
Expand Down
6 changes: 0 additions & 6 deletions example/ios/AgoraRtcNgExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -774,10 +774,7 @@
);
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
" ",
"-Wl -ld_classic ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -850,10 +847,7 @@
);
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
" ",
"-Wl -ld_classic ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ target 'AgoraRtcNgExample' do
end

target 'ScreenShare' do
pod 'AgoraRtcEngine_iOS', '4.2.3'
pod 'AgoraRtcEngine_iOS', '4.2.6'
end
Loading
Loading