From 858b4e272deff9e6050273488fb6139f93992552 Mon Sep 17 00:00:00 2001 From: hanbowen Date: Thu, 16 Jun 2022 17:20:12 +0800 Subject: [PATCH 1/8] fix grammer --- .github/workflows/publish_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 2159a7d..dbc9bc6 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -25,7 +25,7 @@ jobs: run: | export ANDROID_SDK_HOME=$ANDROID_HOME export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME - ./ffmpeg-android-maker.sh ${{ build_options }} -abis=${{ matrix.abi }} + ./ffmpeg-android-maker.sh ${{ buildOptions }} -abis=${{ matrix.abi }} - name: Pack artifacts run: tar -cf build.tar.gz build/ From bbfd9c722b6a015ec62aad3f67cc0d307598925c Mon Sep 17 00:00:00 2001 From: hanbowen Date: Thu, 16 Jun 2022 17:21:10 +0800 Subject: [PATCH 2/8] fix name error --- .github/workflows/publish_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index dbc9bc6..a2ba802 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -25,7 +25,7 @@ jobs: run: | export ANDROID_SDK_HOME=$ANDROID_HOME export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME - ./ffmpeg-android-maker.sh ${{ buildOptions }} -abis=${{ matrix.abi }} + ./ffmpeg-android-maker.sh ${{ input.build_options }} -abis=${{ matrix.abi }} - name: Pack artifacts run: tar -cf build.tar.gz build/ From a80ab2fd477f1e71c61e987855858cc0c47635e2 Mon Sep 17 00:00:00 2001 From: hanbowen Date: Thu, 16 Jun 2022 17:22:22 +0800 Subject: [PATCH 3/8] fix typo --- .github/workflows/publish_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index a2ba802..2e2e1f1 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -25,7 +25,7 @@ jobs: run: | export ANDROID_SDK_HOME=$ANDROID_HOME export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME - ./ffmpeg-android-maker.sh ${{ input.build_options }} -abis=${{ matrix.abi }} + ./ffmpeg-android-maker.sh ${{ inputs.build_options }} -abis=${{ matrix.abi }} - name: Pack artifacts run: tar -cf build.tar.gz build/ From 3ae5d15a1fe6862a18f06701be6e2034aee6e0f5 Mon Sep 17 00:00:00 2001 From: hanbowen Date: Thu, 16 Jun 2022 21:21:20 +0800 Subject: [PATCH 4/8] refine tag name --- .github/workflows/publish_release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 2e2e1f1..1bbb363 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -35,8 +35,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: - release_name: + tag_name: ${{ matrix.abi }} + release_name: ${{ matrix.abi }} draft: true prerelease: false @@ -46,7 +46,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./build.tar.gz - asset_name: build.tar.gz + asset_name: build-${{ matrix.abi }}.tar.gz asset_content_type: application/gz - uses: eregon/publish-release@v1 From 463ce571c8e2e64b284841feb1071523054c670e Mon Sep 17 00:00:00 2001 From: hanbowen Date: Thu, 16 Jun 2022 21:27:06 +0800 Subject: [PATCH 5/8] add ant build --- .github/workflows/compilability_check.yml | 2 +- .github/workflows/publish_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compilability_check.yml b/.github/workflows/compilability_check.yml index 845f7e1..e4e61ac 100644 --- a/.github/workflows/compilability_check.yml +++ b/.github/workflows/compilability_check.yml @@ -13,7 +13,7 @@ jobs: - name: Setup the environment run: | sudo pip3 install meson==0.58.2 - sudo apt-get install nasm ninja-build + sudo apt-get install nasm ninja-build ant - name: Executing the script run: | diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 1bbb363..71699aa 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -19,7 +19,7 @@ jobs: - name: Setup the environment run: | sudo pip3 install meson==0.58.2 - sudo apt-get install nasm ninja-build + sudo apt-get install nasm ninja-build ant - name: Executing the script run: | From 58ebcffd1ab2c87a89b0ffdbd029469e066e3ca3 Mon Sep 17 00:00:00 2001 From: hanbowen Date: Thu, 16 Jun 2022 21:31:49 +0800 Subject: [PATCH 6/8] fix typo --- .github/workflows/publish_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 71699aa..024c438 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -25,7 +25,7 @@ jobs: run: | export ANDROID_SDK_HOME=$ANDROID_HOME export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME - ./ffmpeg-android-maker.sh ${{ inputs.build_options }} -abis=${{ matrix.abi }} + ./ffmpeg-android-maker.sh ${{ inputs.buildOptions }} -abis=${{ matrix.abi }} - name: Pack artifacts run: tar -cf build.tar.gz build/ From 9a6d0129000e61526eea1c2ba5c9b046c4481115 Mon Sep 17 00:00:00 2001 From: hanbowen Date: Thu, 16 Jun 2022 21:44:45 +0800 Subject: [PATCH 7/8] add build time to release artifact --- .github/workflows/publish_release.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 024c438..329548b 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -28,15 +28,22 @@ jobs: ./ffmpeg-android-maker.sh ${{ inputs.buildOptions }} -abis=${{ matrix.abi }} - name: Pack artifacts run: tar -cf build.tar.gz build/ - + - name: Get current date + id: date + run: echo "::set-output name=date::$(date +'%Y-%m-%d')" + - name: Test with environment variables + run: echo $TAG_NAME - $RELEASE_NAME + env: + TAG_NAME: nightly-tag-${{ steps.date.outputs.date }}-${{ matrix.abi }} + RELEASE_NAME: nightly-release-${{ steps.date.outputs.date }}-${{ matrix.abi }} - name: Create Draft Release id: create_release uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ matrix.abi }} - release_name: ${{ matrix.abi }} + tag_name: ${{ env.TAG_NAME }} + release_name: ${{ env.RELEASE_NAME }} draft: true prerelease: false From 5b95a89d6e4d9a651d206642eb5b08275b7e775a Mon Sep 17 00:00:00 2001 From: hanbowen Date: Thu, 16 Jun 2022 22:02:26 +0800 Subject: [PATCH 8/8] fix tag_name --- .github/workflows/publish_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 329548b..1ba25c9 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -42,8 +42,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ env.TAG_NAME }} - release_name: ${{ env.RELEASE_NAME }} + tag_name: nightly-tag-${{ steps.date.outputs.date }}-${{ matrix.abi }} + release_name: nightly-release-${{ steps.date.outputs.date }}-${{ matrix.abi }} draft: true prerelease: false