From e6a8da68cd91984e0f58b322eda20864e8082433 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 1 Apr 2023 21:52:02 +0200 Subject: [PATCH 1/3] Use new codecov uploader --- .woodpecker/.phpunit.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index cd9fea350..d3730cff8 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -71,20 +71,26 @@ pipeline: else phpunit --configuration tests/phpunit.xml; fi - codecov: - image: plugins/codecov + image: friendicaci/codecov when: matrix: PHP_MAJOR_VERSION: 7.4 PHP_VERSION: 7.4.33 repo: - friendica/friendica - settings: - token: - from_secret: codecov-token - files: - - clover.xml + commands: + - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import + - curl -Os https://uploader.codecov.io/latest/alpine/codecov + - curl -Os https://uploader.codecov.io/latest/alpine/codecov.SHA256SUM + - curl -Os https://uploader.codecov.io/latest/alpine/codecov.SHA256SUM.sig + - gpgv codecov.SHA256SUM.sig codecov.SHA256SUM + - shasum -a 256 -c codecov.SHA256SUM + - chmod +x codecov + - ./codecov -B ${CI_COMMIT_BRANCH} -C ${CI_COMMIT_SHA} -P ${CI_COMMIT_PULL_REQUEST} -b ${CI_PIPELINE_NUMBER} -Z -f 'clover.xml' + secrets: + - source: codecov-token + target: codecov_token services: mariadb: From 8a96f0fee410e42ed14c37e2f20fd292e766dcaf Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 1 Apr 2023 21:54:51 +0200 Subject: [PATCH 2/3] Remove unnecessary code .. --- .woodpecker/.phpunit.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index d3730cff8..e4661a91e 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -80,14 +80,7 @@ pipeline: repo: - friendica/friendica commands: - - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import - - curl -Os https://uploader.codecov.io/latest/alpine/codecov - - curl -Os https://uploader.codecov.io/latest/alpine/codecov.SHA256SUM - - curl -Os https://uploader.codecov.io/latest/alpine/codecov.SHA256SUM.sig - - gpgv codecov.SHA256SUM.sig codecov.SHA256SUM - - shasum -a 256 -c codecov.SHA256SUM - - chmod +x codecov - - ./codecov -B ${CI_COMMIT_BRANCH} -C ${CI_COMMIT_SHA} -P ${CI_COMMIT_PULL_REQUEST} -b ${CI_PIPELINE_NUMBER} -Z -f 'clover.xml' + - codecov -B ${CI_COMMIT_BRANCH} -C ${CI_COMMIT_SHA} -P ${CI_COMMIT_PULL_REQUEST} -b ${CI_PIPELINE_NUMBER} -Z -f 'clover.xml' secrets: - source: codecov-token target: codecov_token From a88cc1ff845c171024631c9904a6dd4840cb4715 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 1 Apr 2023 22:00:57 +0200 Subject: [PATCH 3/3] adapt parameters --- .woodpecker/.phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index e4661a91e..aee7fd384 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -80,7 +80,7 @@ pipeline: repo: - friendica/friendica commands: - - codecov -B ${CI_COMMIT_BRANCH} -C ${CI_COMMIT_SHA} -P ${CI_COMMIT_PULL_REQUEST} -b ${CI_PIPELINE_NUMBER} -Z -f 'clover.xml' + - codecov -R '.' -Z -f 'clover.xml' secrets: - source: codecov-token target: codecov_token