diff --git a/.github/workflows/android-ci-debug.yml b/.github/workflows/android-ci-debug.yml index 7907097..f2e4c01 100644 --- a/.github/workflows/android-ci-debug.yml +++ b/.github/workflows/android-ci-debug.yml @@ -39,22 +39,22 @@ jobs: java-version: 17.X - name: ๐Ÿงน Run Android Lint - run: ./gradlew lint -Pandroid.lintOptions.xmlOutput=true + run: ./gradlew lint - name: ๐Ÿ“ Post Lint Results uses: actions/github-script@v5 - if: always() + if: github.event_name == 'pull_request' with: script: | const fs = require('fs'); - const lintResult = fs.readFileSync('./app/build/reports/lint-results.xml', 'utf8'); + const lintResult = fs.readFileSync('./app/lint-results.xml', 'utf8'); const issueComment = ` ## Lint Results ๐Ÿงน \`\`\` ${lintResult} \`\`\` `; - github.issues.createComment({ + github.rest.issues.createComment({ issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, diff --git a/.github/workflows/android-ci-release.yml b/.github/workflows/android-ci-release.yml index cf67768..ae5b098 100644 --- a/.github/workflows/android-ci-release.yml +++ b/.github/workflows/android-ci-release.yml @@ -29,10 +29,16 @@ jobs: - name: ๐Ÿ—๏ธ Decode the Keystore run: echo "${{ secrets.KEYSTORE }}" | base64 --decode > ./keystore.jks + # list files and show pwd for debugging + - name: ๐Ÿ“‚ List files + run: | + ls -la + pwd + - name: ๐Ÿ—๏ธ Build Signed APK run: | bash ./gradlew assembleRelease --stacktrace \ - -Pandroid.injected.signing.store.file=keystore.jks \ + -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/keystore.jks \ -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} @@ -43,14 +49,21 @@ jobs: name: apk path: app/build/outputs/apk/release/app-release.apk + - name: Get OpenCV version and versionName + run: | + echo "opencv_version=$(awk -F'= ' '/def openCVersionName/ { print $2 }' opencvsdk490/sdk/build.gradle | tr -d '\"')" >> "$GITHUB_ENV" + echo "version_name=$(grep -oP 'versionName "\K[^"]+' app/build.gradle)" >> "$GITHUB_ENV" + echo "git_hash=$(git rev-parse --verify --short HEAD)" >> "$GITHUB_ENV" + echo "git_tags=$(git ls-remote --tags --sort=committerdate | grep -o 'v.*' | sort -r | head -1)" >> "$GITHUB_ENV" + - name: ๐Ÿท๏ธ Create Release id: create_release uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} + tag_name: ${{ env.git_tags }} + release_name: Release CvCameraMobile - OpenCV ${{ env.opencv_version }} - Version ${{ env.version_name }} - Git Hash ${{ env.git_hash }} draft: true prerelease: false diff --git a/app/build.gradle b/app/build.gradle index dc0d3ce..7e97e41 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { minSdk 24 targetSdk 34 versionCode 1 - versionName "1.0" + versionName "1.0.1" buildConfigField("String", "GIT_HASH", "\"${gitCommitHash}\"") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -52,6 +52,10 @@ android { baseline = file("lint-baseline.xml") } + lintOptions { + xmlOutput file("lint-results.xml") + } + compileOptions { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17