From 9a8d1fb43f4e5ab4f552315c2bbdf2ca86675626 Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Wed, 28 Apr 2021 18:40:31 +0530 Subject: [PATCH 1/3] fix: decode uri before importing file via weblink --- frappe/public/js/frappe/file_uploader/FileUploader.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue index d0b09c7593..5199d98a1d 100644 --- a/frappe/public/js/frappe/file_uploader/FileUploader.vue +++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue @@ -318,7 +318,7 @@ export default { frappe.msgprint(__('Invalid URL')); return Promise.reject(); } - + file_url = decodeURI(file_url) return this.upload_file({ file_url }); From 90dde099dff5e47cb1d68e38ae6b6a1b661c32f7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 29 Apr 2021 12:55:46 +0530 Subject: [PATCH 2/3] ci: Remove coverage step from workflow --- .github/workflows/ci-tests.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index e21a1f7ac6..b76e72f462 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -143,16 +143,3 @@ jobs: env: DB: ${{ matrix.DB }} TYPE: ${{ matrix.TYPE }} - - - name: Coverage - if: matrix.TYPE == 'server' - run: | - cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE} - cd ${GITHUB_WORKSPACE} - pip install coveralls==2.2.0 - pip install coverage==4.5.4 - coveralls --service=github - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }} - COVERALLS_SERVICE_NAME: github From 3e78995594628ee06aaac548d5e154598f2a3789 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Thu, 29 Apr 2021 13:06:55 +0530 Subject: [PATCH 3/3] ci: Use different service name for push and pull request events (#13030) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- .github/workflows/ci-tests.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index b76e72f462..d2fbef528b 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -143,3 +143,29 @@ jobs: env: DB: ${{ matrix.DB }} TYPE: ${{ matrix.TYPE }} + + - name: Coverage - Pull Request + if: matrix.TYPE == 'server' && github.event_name == 'pull_request' + run: | + cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE} + cd ${GITHUB_WORKSPACE} + pip install coveralls==2.2.0 + pip install coverage==4.5.4 + coveralls --service=github + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }} + COVERALLS_SERVICE_NAME: github + + - name: Coverage - Push + if: matrix.TYPE == 'server' && github.event_name == 'push' + run: | + cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE} + cd ${GITHUB_WORKSPACE} + pip install coveralls==2.2.0 + pip install coverage==4.5.4 + coveralls --service=github-actions + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }} + COVERALLS_SERVICE_NAME: github-actions