diff options
| -rwxr-xr-x | .github/actions/codecov/upload_coverage.sh | 13 | ||||
| -rw-r--r-- | .github/actions/collect-reports/action.yml | 3 | ||||
| -rwxr-xr-x | .github/actions/collect-reports/collect.sh | 15 | ||||
| -rw-r--r-- | .github/workflows/checks.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/deploy.yml | 1 | ||||
| -rw-r--r-- | README.md | 4 |
6 files changed, 32 insertions, 13 deletions
diff --git a/.github/actions/codecov/upload_coverage.sh b/.github/actions/codecov/upload_coverage.sh index 061f15565..d54d50ba6 100755 --- a/.github/actions/codecov/upload_coverage.sh +++ b/.github/actions/codecov/upload_coverage.sh @@ -6,6 +6,15 @@ CODECOV_TOKEN="${1}" wget --tries=5 --waitretry=5 --progress=dot:mega --output-document=codecov.sh https://codecov.io/bash chmod +x codecov.sh -COV_FILES=$(find . -name "test*UnitTestCoverage.xml" | xargs -n 1 echo -n " -f ") +readarray -d '' COV_FILES < <(find . -name "test*UnitTestCoverage.xml" -print0) -./scripts/retry.sh 5 ./codecov.sh -t "${CODECOV_TOKEN}" -y .github/actions/codecov/codecov.yml -X gcov -X coveragepy -X xcode ${COV_FILES} +rm -rf /tmp/coverage || true +mkdir /tmp/coverage + +for cov_file in "${COV_FILES[@]}" +do + echo "file: ${cov_file}" + cp "${cov_file}" "/tmp/coverage/${RANDOM}-${RANDOM}.xml" +done + +./scripts/retry.sh 5 ./codecov.sh -t "${CODECOV_TOKEN}" -y .github/actions/codecov/codecov.yml -X search -X gcov -X coveragepy -X xcode -f '/tmp/coverage/*.xml' diff --git a/.github/actions/collect-reports/action.yml b/.github/actions/collect-reports/action.yml index 7dc42a525..01646533c 100644 --- a/.github/actions/collect-reports/action.yml +++ b/.github/actions/collect-reports/action.yml @@ -7,7 +7,8 @@ inputs: description: "collect destination" default: "collected_reports" file_pattern: - description: "pattern" + description: "pattern for files" + required: true runs: using: "docker" diff --git a/.github/actions/collect-reports/collect.sh b/.github/actions/collect-reports/collect.sh index 6b641f0c2..eed70a4ad 100755 --- a/.github/actions/collect-reports/collect.sh +++ b/.github/actions/collect-reports/collect.sh @@ -2,6 +2,15 @@ set -e OUTPUT=${1} -PATTERN=${2} -mkdir ${OUTPUT} || true -find . -path ./${OUTPUT} -prune -o -name "${PATTERN}" -exec cp {} ${OUTPUT}/ \; +FILE_PATTERN=${2} + +rm -rf "/tmp/${OUTPUT}" || true +mkdir -p "/tmp/${OUTPUT}" +rm -rf "${OUTPUT}" || true +mkdir -p "${OUTPUT}" + +TEMP_TAR="/tmp/${OUTPUT}/archive.tar" +tar -cvf "${TEMP_TAR}" --files-from /dev/null +find . -path "${FILE_PATTERN}" -exec tar uvf "${TEMP_TAR}" {} \; + +mv "${TEMP_TAR}" "${OUTPUT}/" diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index fd1860dd6..20c064ae2 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -53,10 +53,12 @@ jobs: if: always() with: file_pattern: checkstyle*.html + output_folder: collected_reports/checkstyle - uses: ./.github/actions/collect-reports if: always() with: file_pattern: lint-results-*.html + output_folder: collected_reports/lint - uses: actions/upload-artifact@v1.0.0 if: always() with: @@ -91,7 +93,7 @@ jobs: - uses: ./.github/actions/collect-reports if: always() with: - file_pattern: "**/build/reports/tests/**/*" + file_pattern: "**/build/reports/tests/**" - uses: actions/upload-artifact@v1.0.0 if: always() with: @@ -121,7 +123,7 @@ jobs: - uses: ./.github/actions/collect-reports if: always() with: - file_pattern: "**/build/reports/tests/**/*" + file_pattern: "**/build/reports/tests/**" - uses: actions/upload-artifact@v1.0.0 if: always() with: @@ -151,7 +153,7 @@ jobs: - uses: ./.github/actions/collect-reports if: always() with: - file_pattern: "**/build/reports/tests/**/*" + file_pattern: "**/build/reports/tests/**" - uses: actions/upload-artifact@v1.0.0 if: always() with: @@ -185,6 +187,7 @@ jobs: needs: [setup, checks, app-all-sdks-tests, app-tests-shards, app-less-tests] runs-on: ubuntu-18.04 steps: + - uses: actions/checkout@v2 - uses: ./.github/actions/deploy-request with: ref: ${{ github.ref }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 39b589dd8..7c1673ac1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -55,7 +55,6 @@ jobs: name: apks path: outputs/apks - uses: actions/upload-artifact@v1.0.0 - if: ${{ startsWith(github.event.environment, 'app') }} with: name: proguard-mapping path: ime/app/build/outputs/mapping @@ -1,7 +1,5 @@ -AnySoftKeyboard +AnySoftKeyboard [](https://github.com/AnySoftKeyboard/AnySoftKeyboard/releases) ==================== -[](https://github.com/AnySoftKeyboard/AnySoftKeyboard/releases)<br/> -<br/> `master` latest build: <br/> `master` latest deploy: <br/> `master` coverage: [](https://codecov.io/gh/AnySoftKeyboard/AnySoftKeyboard)<br/> |