diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d772ab..4b90212 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,10 @@ on: package: required: true type: string - + version: + required: false + type: string + default: '' jobs: build: if: "!contains(github.event.head_commit.message, '[SkipCI]')" @@ -32,7 +35,7 @@ jobs: - run: sdkmanager "ndk;${{ matrix.ndk }}" - run: pip3 install --user ninja meson - - run: ./gradlew ${{ inputs.package }}:publishToMavenLocal -PndkPath=${{ env.ANDROID_SDK_ROOT }}/ndk/${{ matrix.ndk }} -PlibraryType=${{ matrix.libraryType }} + - run: ./gradlew ${{ inputs.package }}:publishToMavenLocal -PpackageVersion=${{ inputs.version }} -PndkPath=${{ env.ANDROID_SDK_ROOT }}/ndk/${{ matrix.ndk }} -PlibraryType=${{ matrix.libraryType }} - uses: actions/upload-artifact@v3 name: Artifact logs diff --git a/.github/workflows/pango.yml b/.github/workflows/pango.yml index 2e9ea06..54df46f 100644 --- a/.github/workflows/pango.yml +++ b/.github/workflows/pango.yml @@ -9,8 +9,16 @@ on: - '.github/workflows/pango.yml' jobs: - build: - name: pango + build-pango-current: + name: pango 1.51.0 uses: ./.github/workflows/build.yml with: package: pango + version: 1.51.0 + + build-pango-legacy: + name: pango 1.49.4 + uses: ./.github/workflows/build.yml + with: + package: pango + version: 1.49.4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ff5af8..88b7f44 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,10 @@ on: PACKAGE: description: 'Package name' required: true + VERSION: + description: 'Package version' + default: '' + required: false jobs: release: name: Release ${{ github.event.inputs.PACKAGE }} ${{ matrix.ndk }} ${{ matrix.libraryType }} @@ -31,7 +35,7 @@ jobs: - run: sdkmanager "ndk;${{ matrix.ndk }}" - run: pip3 install --user ninja meson - - run: ./gradlew ${{ github.event.inputs.PACKAGE }}:publishToMavenLocal -PndkPath=${{ env.ANDROID_SDK_ROOT }}/ndk/${{ matrix.ndk }} -PlibraryType=${{ matrix.libraryType }} + - run: ./gradlew ${{ github.event.inputs.PACKAGE }}:publishToMavenLocal -PpackageVersion=${{ github.even.inputs.VERSION }} -PndkPath=${{ env.ANDROID_SDK_ROOT }}/ndk/${{ matrix.ndk }} -PlibraryType=${{ matrix.libraryType }} - uses: actions/upload-artifact@v3 with: @@ -46,7 +50,7 @@ jobs: path: ~/.m2 if-no-files-found: error - - run: ./gradlew ${{ github.event.inputs.PACKAGE }}:publishToSonatype closeSonatypeStagingRepository -PndkPath=${{ env.ANDROID_SDK_ROOT }}/ndk/${{ matrix.ndk }} -PlibraryType=${{ matrix.libraryType }} + - run: ./gradlew ${{ github.event.inputs.PACKAGE }}:publishToSonatype -PpackageVersion=${{ github.even.inputs.VERSION }} closeSonatypeStagingRepository -PndkPath=${{ env.ANDROID_SDK_ROOT }}/ndk/${{ matrix.ndk }} -PlibraryType=${{ matrix.libraryType }} env: ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}