Skip to content

Commit 8b8075f

Browse files
committed
ci: rename ffmpeg.platform to deploy.platform
1 parent 97194f9 commit 8b8075f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/actions/deploy-ubuntu/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ runs:
229229
- name: Publish release
230230
shell: bash
231231
if: "github.event_name == 'release'"
232-
run: ./gradlew clean publish ${{ inputs.tests == 'true' && 'check' || '-x check -x test' }} -Pdeploy.kotlin=false -Pdeploy.native=true -Pffmpeg.platform=${{ github.job }} -Pffmpeg.gpl=${{ matrix.gpl }} -Pdeploy.version=${{ github.event.release.tag_name }} --console=plain --info --configure-on-demand --parallel --build-cache --configuration-cache
232+
run: ./gradlew clean publish ${{ inputs.tests == 'true' && 'check' || '-x check -x test' }} -Pdeploy.kotlin=false -Pdeploy.native=true -Pdeploy.platform=${{ github.job }} -Pffmpeg.gpl=${{ matrix.gpl }} -Pdeploy.version=${{ github.event.release.tag_name }} --console=plain --info --configure-on-demand --parallel --build-cache --configuration-cache
233233

234234
- name: Set outputs
235235
id: vars
@@ -238,4 +238,4 @@ runs:
238238
- name: Publish snapshot
239239
shell: bash
240240
if: "github.event_name != 'release'"
241-
run: ./gradlew clean publish ${{ inputs.tests == 'true' && 'check' || '-x check -x test' }} -Pdeploy.kotlin=false -Pdeploy.native=true -Pffmpeg.platform=${{ github.job }} -Pffmpeg.gpl=${{ matrix.gpl }} -Pdeploy.version=${{ steps.vars.outputs.sha_short }}-dev --console=plain --info --configure-on-demand --parallel --build-cache --configuration-cache
241+
run: ./gradlew clean publish ${{ inputs.tests == 'true' && 'check' || '-x check -x test' }} -Pdeploy.kotlin=false -Pdeploy.native=true -Pdeploy.platform=${{ github.job }} -Pffmpeg.gpl=${{ matrix.gpl }} -Pdeploy.version=${{ steps.vars.outputs.sha_short }}-dev --console=plain --info --configure-on-demand --parallel --build-cache --configuration-cache

ffmpeg/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ val deployNative = (findProperty("deploy.native") as String?)?.toBoolean() ?: tr
2424

2525
val withGPL: Boolean = findProperty("ffmpeg.gpl").toString().toBoolean()
2626
val platformExtension = "-gpl".takeIf { withGPL }.orEmpty()
27-
val platformString = findProperty("ffmpeg.platform")?.toString()
27+
val platformString = findProperty("deploy.platform")?.toString()
2828
val platform = platformString?.let { Platform(it, platformExtension) } ?: NativePlatform.platform(platformExtension)
2929
val compileDir = layout.projectDirectory.dir("cppbuild/${platform}")
3030

0 commit comments

Comments
 (0)