From 817a2f4a5264eb04de9fb56a00ef2383a1ad2685 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Mon, 30 Sep 2019 14:02:40 +0200 Subject: [PATCH] Add token for codecov & refactored some parts of drone.yml --- .codecov.yml | 1 - .drone.yml | 52 ++++++++-------------------------------------------- 2 files changed, 8 insertions(+), 45 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index fb62e84151..0c54747c95 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -2,7 +2,6 @@ codecov: branch: develop ci: - drone.friendi.ca - - !scrutinizer-ci.com coverage: precision: 2 diff --git a/.drone.yml b/.drone.yml index 4ccc6bfce7..65211da2cf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -129,8 +129,8 @@ steps: - sleep 20 - ./autotest.sh mariadb - wget https://codecov.io/bash -O codecov.sh - - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi" - - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi" environment: MYSQL_USER: friendica MYSQL_PASSWORD: friendica @@ -231,14 +231,6 @@ volumes: - name: cache temp: {} -trigger: - branch: - - master - - develop - - "*-rc" - event: - - pull_request - - push --- kind: pipeline name: redis-php7.1 @@ -251,8 +243,8 @@ steps: - sleep 20 - NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql - wget https://codecov.io/bash -O codecov.sh - - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi" - - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi" environment: REDIS_HOST: redis @@ -308,15 +300,6 @@ services: - name: redis image: redis -trigger: - branch: - - master - - develop - - "*-rc" - event: - - pull_request - - push - --- kind: pipeline name: memcache-php7.1 @@ -329,8 +312,8 @@ steps: - sleep 20 - NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql - wget https://codecov.io/bash -O codecov.sh - - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi" - - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi" environment: MEMCACHE_HOST: memcached @@ -386,16 +369,6 @@ services: - name: memcached image: memcached -trigger: - branch: - - master - - develop - - "*-rc" - event: - - pull_request - - push - - --- kind: pipeline name: memcached-php7.1 @@ -408,8 +381,8 @@ steps: - sleep 20 - NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql - wget https://codecov.io/bash -O codecov.sh - - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi" - - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi" environment: MEMCACHED_HOST: memcached @@ -464,12 +437,3 @@ steps: services: - name: memcached image: memcached - -trigger: - branch: - - master - - develop - - "*-rc" - event: - - pull_request - - push