Skip to content

Commit 43f743f

Browse files
committed
ci: fix publish flag
1 parent f21cd54 commit 43f743f

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runs:
3737
- name: Publish release
3838
shell: bash
3939
if: "github.event_name == 'release'"
40-
run: ./gradlew clean ${{ inputs.publish == 'true' && 'publish' || '' }} ${{ inputs.tests == 'true' && 'check' || '-x check -x test' }} -Pdeploy.kotlin=true -Pdeploy.native=false -Pdeploy.version=${{ github.event.release.tag_name }} --console=plain --info --configure-on-demand --parallel --build-cache --configuration-cache
40+
run: ./gradlew clean ${{ inputs.publish == 'true' && 'publish' || 'assemble' }} ${{ inputs.tests == 'true' && 'check' || '-x check -x test' }} -Pdeploy.kotlin=true -Pdeploy.native=false -Pdeploy.version=${{ github.event.release.tag_name }} --console=plain --info --configure-on-demand --parallel --build-cache --configuration-cache
4141

4242
- name: Set outputs
4343
id: vars
@@ -46,4 +46,4 @@ runs:
4646
- name: Publish snapshot
4747
shell: bash
4848
if: "github.event_name != 'release'"
49-
run: ./gradlew clean ${{ inputs.publish == 'true' && 'publish' || '' }} ${{ inputs.tests == 'true' && 'check' || '-x check -x test' }} -Pdeploy.kotlin=true -Pdeploy.native=false -Pdeploy.version=${{ steps.vars.outputs.sha_short }}-dev --console=plain --info --configure-on-demand --parallel --build-cache --configuration-cache
49+
run: ./gradlew clean ${{ inputs.publish == 'true' && 'publish' || 'assemble' }} ${{ inputs.tests == 'true' && 'check' || '-x check -x test' }} -Pdeploy.kotlin=true -Pdeploy.native=false -Pdeploy.version=${{ steps.vars.outputs.sha_short }}-dev --console=plain --info --configure-on-demand --parallel --build-cache --configuration-cache

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ runs:
236236
- name: Publish release
237237
shell: bash
238238
if: "github.event_name == 'release'"
239-
run: ./gradlew clean ${{ inputs.publish == 'true' && '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
239+
run: ./gradlew clean ${{ inputs.publish == 'true' && 'publish' || 'assemble' }} ${{ 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
240240

241241
- name: Set outputs
242242
id: vars
@@ -245,4 +245,4 @@ runs:
245245
- name: Publish snapshot
246246
shell: bash
247247
if: "github.event_name != 'release'"
248-
run: ./gradlew clean ${{ inputs.publish == 'true' && '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
248+
run: ./gradlew clean ${{ inputs.publish == 'true' && 'publish' || 'assemble' }} ${{ 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

build.gradle.kts

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ plugins {
66
`maven-publish`
77
}
88

9-
group = "dev.silenium.libs.ffmpeg"
10-
version = findProperty("deploy.version") as String? ?: "0.0.0-SNAPSHOT"
11-
129
repositories {
1310
mavenCentral()
1411
maven("https://reposilite.silenium.dev/releases") {
@@ -42,6 +39,10 @@ tasks.jar {
4239

4340
allprojects {
4441
apply<MavenPublishPlugin>()
42+
apply<BasePlugin>()
43+
44+
group = "dev.silenium.libs.ffmpeg"
45+
version = findProperty("deploy.version") as String? ?: "0.0.0-SNAPSHOT"
4546

4647
publishing {
4748
repositories {
@@ -51,7 +52,8 @@ allprojects {
5152
username =
5253
System.getenv("REPOSILITE_USERNAME") ?: project.findProperty("reposiliteUser") as String? ?: ""
5354
password =
54-
System.getenv("REPOSILITE_PASSWORD") ?: project.findProperty("reposilitePassword") as String? ?: ""
55+
System.getenv("REPOSILITE_PASSWORD") ?: project.findProperty("reposilitePassword") as String?
56+
?: ""
5557
}
5658
}
5759
}

0 commit comments

Comments
 (0)