forked from NextAlone/Nagram
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/dev' into dev
- Loading branch information
Showing
269 changed files
with
18,262 additions
and
3,901 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,36 +8,32 @@ on: | |
| - '**.xml' | ||
|
|
||
| jobs: | ||
| check: | ||
| name: Check Access | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: "Check access" | ||
| uses: "lannonbr/[email protected]" | ||
| with: | ||
| permission: "write" | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| ffmpeg: | ||
| name: Native Build (FFmpeg) | ||
| runs-on: ubuntu-latest | ||
| needs: check | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - name: Fetch Status | ||
| run: | | ||
| sed -i 's/\/\///g' settings.gradle | ||
| git submodule status TMessagesProj/jni/ffmpeg > ffmpeg_status | ||
| git submodule status TMessagesProj/jni/libvpx > libvpx_status | ||
| git submodule status TMessagesProj/jni/dav1d > libdav1d_status | ||
| - name: FFmpeg Cache | ||
| id: cache | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| TMessagesProj/jni/ffmpeg/build | ||
| TMessagesProj/jni/libvpx/build | ||
| key: ${{ hashFiles('ffmpeg_status', 'libvpx_status', 'TMessagesProj/jni/*ffmpeg*.sh', 'TMessagesProj/jni/*libvpx*.sh', 'TMessagesProj/jni/patches/ffmpeg/*') }} | ||
| TMessagesProj/jni/dav1d/build | ||
| key: ${{ hashFiles('ffmpeg_status', 'libvpx_status', 'libdav1d_status', 'TMessagesProj/jni/*ffmpeg*.sh', 'TMessagesProj/jni/*libvpx*.sh', 'TMessagesProj/jni/*dav1d*.sh', 'TMessagesProj/jni/patches/ffmpeg/*') }} | ||
| - name: Set up Python 3.12 | ||
| uses: actions/setup-python@v5 | ||
| if: steps.cache.outputs.cache-hit != 'true' | ||
| with: | ||
| python-version: '3.12' | ||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v3 | ||
| if: steps.cache.outputs.cache-hit != 'true' | ||
|
|
@@ -56,23 +52,24 @@ jobs: | |
| - name: Native Build | ||
| if: steps.cache.outputs.cache-hit != 'true' | ||
| run: | | ||
| sudo apt-get install yasm -y | ||
| ./run init action ffmpeg | ||
| ./run init libs libvpx | ||
| ./run init libs dav1d | ||
| ./run init libs ffmpeg | ||
| boringssl: | ||
| name: Native Build (BoringSSL) | ||
| runs-on: ubuntu-latest | ||
| needs: check | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - name: Fetch Status | ||
| run: | | ||
| sed -i 's/\/\///g' settings.gradle | ||
| git submodule status TMessagesProj/jni/boringssl > boringssl_status | ||
| - name: BoringSSL Cache | ||
| id: cache | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| TMessagesProj/jni/boringssl/build | ||
|
|
@@ -110,16 +107,17 @@ jobs: | |
| - arm64-v8a | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - name: Fetch Status | ||
| run: | | ||
| sed -i 's/\/\///g' settings.gradle | ||
| git submodule status TMessagesProj/jni/ffmpeg > ffmpeg_status | ||
| git submodule status TMessagesProj/jni/libvpx > libvpx_status | ||
| git submodule status TMessagesProj/jni/dav1d > libdav1d_status | ||
| git submodule status TMessagesProj/jni/boringssl > boringssl_status | ||
| - name: Native Cache | ||
| id: cache | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| TMessagesProj/src/main/libs | ||
|
|
@@ -129,15 +127,16 @@ jobs: | |
| run: | | ||
| git submodule update --init 'TMessagesProj/jni/*' | ||
| - name: FFmpeg Cache | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| if: steps.cache.outputs.cache-hit != 'true' | ||
| with: | ||
| path: | | ||
| TMessagesProj/jni/ffmpeg/build | ||
| TMessagesProj/jni/libvpx/build | ||
| key: ${{ hashFiles('ffmpeg_status', 'libvpx_status', 'TMessagesProj/jni/*ffmpeg*.sh', 'TMessagesProj/jni/*libvpx*.sh', 'TMessagesProj/jni/patches/ffmpeg/*') }} | ||
| TMessagesProj/jni/dav1d/build | ||
| key: ${{ hashFiles('ffmpeg_status', 'libvpx_status', 'libdav1d_status', 'TMessagesProj/jni/*ffmpeg*.sh', 'TMessagesProj/jni/*libvpx*.sh', 'TMessagesProj/jni/*dav1d*.sh', 'TMessagesProj/jni/patches/ffmpeg/*') }} | ||
| - name: BoringSSL Cache | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| if: steps.cache.outputs.cache-hit != 'true' | ||
| with: | ||
| path: | | ||
|
|
@@ -299,7 +298,7 @@ jobs: | |
| - MiniRelease | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
|
|
@@ -321,13 +320,13 @@ jobs: | |
| git submodule status 'ssr-libev/*' > shadowsocksr_status | ||
| git submodule status v2ray > v2ray_status | ||
| - name: Native Cache (armeabi-v7a) | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| TMessagesProj/src/main/libs | ||
| key: ${{ hashFiles('TMessagesProj/jni/**', 'ffmpeg_status', 'boringssl_status') }}-armeabi-v7a | ||
| - name: Native Cache (arm64-v8a) | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| TMessagesProj/src/main/libs | ||
|
|
@@ -355,7 +354,7 @@ jobs: | |
| sed -i -e "s/16384/6144/g" gradle.properties | ||
| echo "sdk.dir=${ANDROID_HOME}" >> local.properties | ||
| - name: Gradle cache | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ~/.gradle | ||
| key: gradle-${{ hashFiles('**/*.gradle') }} | ||
|
|
||
Oops, something went wrong.