From 2b3d59e8c110433f94b55a0006f681687daecc3c Mon Sep 17 00:00:00 2001 From: Ibrahem Khalil <33176106+ibrkhalil@users.noreply.github.com> Date: Wed, 24 Aug 2022 23:31:20 +0200 Subject: [PATCH 1/7] Issue-13813: Use new endpoints for browser (#13827) * Bump browswer endpoints https://github.com/status-im/status-go/compare/f43f43cc...924820c1 Rebase Rebase * Bump endpoints * Bump status-go https://github.com/status-im/status-go/compare/f43f43cc...f43f43cc Rebase * typo --- src/status_im/browser/core.cljs | 6 +++--- src/status_im/multiaccounts/login/core.cljs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/status_im/browser/core.cljs b/src/status_im/browser/core.cljs index f46406cdef..14d3884a57 100644 --- a/src/status_im/browser/core.cljs +++ b/src/status_im/browser/core.cljs @@ -50,7 +50,7 @@ {:events [:browser.ui/remove-browser-pressed]} [{:keys [db]} browser-id] {:db (update-in db [:browser/browsers] dissoc browser-id) - ::json-rpc/call [{:method "browsers_deleteBrowser" + ::json-rpc/call [{:method "wakuext_deleteBrowser" :params [browser-id] :on-success #()}]}) @@ -59,7 +59,7 @@ [{:keys [db]}] {:db (dissoc db :browser/browsers) ::json-rpc/call (for [browser-id (keys (get db :browser/browsers))] - {:method "browsers_deleteBrowser" + {:method "wakuext_deleteBrowser" :params [browser-id] :on-success #()})}) @@ -96,7 +96,7 @@ {:db (update-in db [:browser/browsers browser-id] merge updated-browser) - ::json-rpc/call [{:method "browsers_addBrowser" + ::json-rpc/call [{:method "wakuext_addBrowser" :params [(select-keys updated-browser [:browser-id :timestamp :name :dapp? :history :history-index])] :on-success #()}]})) diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs index f8dd0dbeae..61d4062e9f 100644 --- a/src/status_im/multiaccounts/login/core.cljs +++ b/src/status_im/multiaccounts/login/core.cljs @@ -328,7 +328,7 @@ (fx/defn initialize-browser [_] {::json-rpc/call - [{:method "browsers_getBrowsers" + [{:method "wakuext_getBrowsers" :on-success #(re-frame/dispatch [::initialize-browsers %])} {:method "browsers_getBookmarks" :on-success #(re-frame/dispatch [::initialize-bookmarks %])} From cdcaa683959687de1cc602e2b9d5fae119c77f43 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Thu, 25 Aug 2022 12:23:06 +0200 Subject: [PATCH 2/7] [#13835] Fix Generate keys button --- src/status_im/keycard/recovery.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/status_im/keycard/recovery.cljs b/src/status_im/keycard/recovery.cljs index 1c335fccae..d0de9c05cb 100644 --- a/src/status_im/keycard/recovery.cljs +++ b/src/status_im/keycard/recovery.cljs @@ -131,7 +131,7 @@ (update :keycard dissoc :flow) (dissoc :restored-account?))} (multiaccounts.create/prepare-intro-wizard) - (navigation/navigate-to-cofx :get-your-keys nil))) + (navigation/set-stack-root :onboarding [:get-your-keys]))) (fx/defn recovery-no-key {:events [:keycard.recovery.no-key.ui/generate-key-pressed]} From 976f58606cec67cdb3e43d86f621d7c976148b73 Mon Sep 17 00:00:00 2001 From: Churikova Tetiana Date: Thu, 25 Aug 2022 12:49:51 +0200 Subject: [PATCH 3/7] e2e: fixes --- test/appium/tests/critical/wallet_and_tx/test_wallet.py | 1 + test/appium/tests/medium/test_single_device.py | 3 +-- test/appium/views/base_view.py | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/test/appium/tests/critical/wallet_and_tx/test_wallet.py b/test/appium/tests/critical/wallet_and_tx/test_wallet.py index 0fb836b17a..d26a5c7783 100644 --- a/test/appium/tests/critical/wallet_and_tx/test_wallet.py +++ b/test/appium/tests/critical/wallet_and_tx/test_wallet.py @@ -129,6 +129,7 @@ class TestWalletManagementDeviceMerged(MultipleSharedDeviceTestCase): self.sign_in.just_fyi("Check that 0 asset is not disappearing after relogin") self.wallet.reopen_app() + self.home.continue_syncing_button.click_if_shown(5) self.sign_in.wallet_button.click() self.wallet.asset_by_name(asset).scroll_to_element() diff --git a/test/appium/tests/medium/test_single_device.py b/test/appium/tests/medium/test_single_device.py index 1383406b0b..43a7d5c913 100644 --- a/test/appium/tests/medium/test_single_device.py +++ b/test/appium/tests/medium/test_single_device.py @@ -906,10 +906,9 @@ class TestChatManagement(SingleDeviceTestCase): profile.close_button.click() if not profile.element_by_text(h_node).is_element_displayed(): self.errors.append('"%s" history node is not pinned' % h_node) - profile.home_button.click() profile.just_fyi('Relogin and check that settings are preserved') - home.relogin() + home.reopen_app() home.profile_button.click() profile.sync_settings_button.click() if not profile.element_by_text(h_node).is_element_displayed(): diff --git a/test/appium/views/base_view.py b/test/appium/views/base_view.py index 32801bfe85..2852945706 100644 --- a/test/appium/views/base_view.py +++ b/test/appium/views/base_view.py @@ -538,16 +538,14 @@ class BaseView(object): def get_back_to_home_view(self, times_to_click_on_back_btn=3): counter = 0 - while self.back_button.is_element_displayed(2) or self.close_button.is_element_displayed(2) or self.navigate_up_button.is_element_displayed(2): + while self.back_button.is_element_displayed(2) or self.navigate_up_button.is_element_displayed(2): try: if counter >= times_to_click_on_back_btn: break if self.back_button.is_element_displayed(2): - self.back_button.click_until_presence_of_element(self.home_button) - elif self.close_button.is_element_displayed(2): - self.close_button.click_until_presence_of_element(self.home_button) + self.back_button.click_until_absense_of_element(self.back_button) else: - self.navigate_up_button.click_until_presence_of_element(self.home_button) + self.navigate_up_button.click_until_absense_of_element(self.navigate_up_button) counter += 1 except (NoSuchElementException, TimeoutException): continue From 47a31ae0aa2eb5ab8626a7cbbe7fab26b366faed Mon Sep 17 00:00:00 2001 From: Jamie Caprani Date: Thu, 25 Aug 2022 14:48:29 +0100 Subject: [PATCH 4/7] feat: add token tag component (#13599) (#13644) --- resources/images/icons/purchasable12@2x.png | Bin 0 -> 629 bytes resources/images/icons/purchasable12@3x.png | Bin 0 -> 806 bytes .../images/icons/required_checkmark12@2x.png | Bin 0 -> 262 bytes .../images/icons/required_checkmark12@3x.png | Bin 0 -> 336 bytes src/quo2/components/tag.cljs | 51 +++++++++++++ src/quo2/components/token_tag.cljs | 55 ++++++++++++++ src/quo2/screens/main.cljs | 4 + src/quo2/screens/token_tag.cljs | 69 ++++++++++++++++++ 8 files changed, 179 insertions(+) create mode 100644 resources/images/icons/purchasable12@2x.png create mode 100644 resources/images/icons/purchasable12@3x.png create mode 100644 resources/images/icons/required_checkmark12@2x.png create mode 100644 resources/images/icons/required_checkmark12@3x.png create mode 100644 src/quo2/components/tag.cljs create mode 100644 src/quo2/components/token_tag.cljs create mode 100644 src/quo2/screens/token_tag.cljs diff --git a/resources/images/icons/purchasable12@2x.png b/resources/images/icons/purchasable12@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..01ad5e35c57f45261640e13e19c31a98b3b0f8e1 GIT binary patch literal 629 zcmV-*0*d{KP)srTU>e?C$C1|~+a_!+gDIdg9MJ=J;fhm`qWk#<_?`!P!I+sPnT#J zg(3G0zbjc&3v;u%{du;n9sGa$urs8gCtn!*78&SfP6ER`bKF6}7$&i>m&E$1zuy?> zYnZ-z@u=JWyzvX|gAT?ZG87Nla4*m7A4CIvi;I)(Sn=XGVEqU|>SH~1tSx>PY?RZCw4>iyzF28uq(?dsh> z0%uNg@>B+m1o6Y(vh*XPu3|oSOER-8)~@glE4`wWp8inJkcN30iJ6=M1KIqEP)K~#7F&6qok z(?Af0|6L~q72&uVjC49W5}GIi36dTJlviDX0MQXz1e^g0i3-ypL`bf>5)kw;4LVVP zMTbOTsAxczpiAOq#(5~oC9$2SKPmAfyS9JL%syrXB672A=q-`F1m$Hs$ULA@0!VS2 z0$j2kG94j=rK!f-=ceIAcsxYdj@Qc%iwbg^%sirDOCik{Pw(u8=^QBNTKQ3)gj5BT zju}u;jwUoCNZ43G<+73bhr|w>m@j4%%?CBpa1mAz=SdTZ*JNg}0N7hevGKD<~@t8 zME5Tb8hZy(DQ;cB*=*XkKYsd(>fSpD;+p%BMr~&MD3r5>p~EzecqO9>-ku zOC)V)9>+2CvQoDo97pH_D;6f( zI~FhJ6I;@Jw#b7 Date: Fri, 26 Aug 2022 15:18:45 +0200 Subject: [PATCH 5/7] ci: extrac Lint and Tests to separate job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way we can make PRs depend only on successful tests, and not whole builds for all platforms, which take 10 minutes or more. Signed-off-by: Jakub Sokołowski --- Makefile | 3 +- ci/Jenkinsfile.android | 86 ++++++++++++----------------------------- ci/Jenkinsfile.combined | 3 ++ ci/Jenkinsfile.ios | 73 +++++++++------------------------- ci/Jenkinsfile.tests | 77 ++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 118 deletions(-) create mode 100644 ci/Jenkinsfile.tests diff --git a/Makefile b/Makefile index 2f34278669..5478d9bdf8 100644 --- a/Makefile +++ b/Makefile @@ -298,13 +298,12 @@ shadow-server:##@ Start shadow-cljs in server mode for watching yarn shadow-cljs server test-watch: export TARGET := clojure -test-watch: status-go-library test-watch: ##@ Watch tests and re-run no changes to cljs files yarn install nodemon --exec 'yarn shadow-cljs compile mocks && yarn shadow-cljs compile test && node --require ./test-resources/override.js target/test/test.js' -e cljs test: export TARGET := clojure -test: status-go-library ##@test Run tests once in NodeJS +test: ##@test Run tests once in NodeJS # Here we creates the gyp bindings for nodejs yarn install yarn shadow-cljs compile mocks && \ diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index cfda26dabb..4ee92f2525 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -56,43 +56,14 @@ pipeline { } } } - stage('Parallel Assemble') { - parallel { - stage('Checks') { stages { - stage('Lint') { - steps { - script { - /* We want the build result to be uploaded */ - catchError( - message: 'Linting check failed!', - buildResult: 'FAILURE', - stageResult: 'FAILURE' - ) { - sh 'make lint' - } - } - } - } - stage('Tests') { - steps { - script { - sh 'make test' - } - } - } - } } - stage('Build') { stages { - stage('Bundle') { - steps { - script { apks = android.bundle() } - } - } - stage('Sign') { - steps { - script { apks = android.sign(apks) } - } - } - } } + stage('Bundle') { + steps { + script { apks = android.bundle() } + } + } + stage('Sign') { + steps { + script { apks = android.sign(apks) } } } stage('Parallel Upload') { @@ -103,37 +74,30 @@ pipeline { } } } stage('Upload') { - steps { - script { - def urls = apks.collect { s3.uploadArtifact(it) } - /* return only the universal APK */ - if (urls.size() > 1) { - env.PKG_URL = urls.find { it.contains('universal') } - } else { /* if no universal is available pick first */ - env.PKG_URL = urls.first() - } - jenkins.setBuildDesc(APK: env.PKG_URL) - /* e2e builds get tested in SauceLabs */ - if (utils.isE2EBuild()) { - env.SAUCE_URL = android.uploadToSauceLabs() - } - if (utils.isNightlyBuild()) { - env.DIAWI_URL = android.uploadToDiawi() - } + steps { script { + def urls = apks.collect { s3.uploadArtifact(it) } + /* return only the universal APK */ + if (urls.size() > 1) { + env.PKG_URL = urls.find { it.contains('universal') } + } else { /* if no universal is available pick first */ + env.PKG_URL = urls.first() } - } + jenkins.setBuildDesc(APK: env.PKG_URL) + /* e2e builds get tested in SauceLabs */ + if (utils.isE2EBuild()) { + env.SAUCE_URL = android.uploadToSauceLabs() + } + if (utils.isNightlyBuild()) { + env.DIAWI_URL = android.uploadToDiawi() + } + } } } } } - stage('Cleanup') { - steps { - sh 'make purge' - } - } } post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - always { sh 'make _fix-node-perms' } + always { sh 'make purge' } } } diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index 89eb215933..c0c0bae498 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -49,6 +49,9 @@ pipeline { stage('Android e2e') { steps { script { apke2e = jenkins.Build('status-mobile/platforms/android-e2e') } } } + stage('Tests') { steps { script { + ios = jenkins.Build('status-mobile/platforms/tests') + } } } } } stage('Archive') { diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index a635922f39..790a7ae789 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -55,43 +55,14 @@ pipeline { } } } - stage('Parallel Assemble') { - parallel { - stage('Checks') { stages { - stage('Lint') { - steps { - script { - /* We want the build result to be uploaded */ - catchError( - message: 'Linting check failed!', - buildResult: 'FAILURE', - stageResult: 'FAILURE' - ) { - sh 'make lint' - } - } - } - } - stage('Tests') { - steps { - script { - sh 'make test' - } - } - } - } } - stage('Build') { stages { - stage('JSBundle') { - steps { - script { ios.jsbundle() } - } - } - stage('Bundle') { - steps { - script { api = ios.bundle() } - } - } - } } + stage('JSBundle') { + steps { + script { ios.jsbundle() } + } + } + stage('Bundle') { + steps { + script { api = ios.bundle() } } } stage('Parallel Upload') { @@ -102,31 +73,23 @@ pipeline { } } stage('Upload') { - steps { - script { - env.PKG_URL = s3.uploadArtifact(api) - jenkins.setBuildDesc(IPA: env.PKG_URL) - /* e2e builds get tested in SauceLabs */ - if (utils.isE2EBuild()) { - env.SAUCE_URL = ios.uploadToSauceLabs() - } else { - env.DIAWI_URL = ios.uploadToDiawi() - } + steps { script { + env.PKG_URL = s3.uploadArtifact(api) + jenkins.setBuildDesc(IPA: env.PKG_URL) + /* e2e builds get tested in SauceLabs */ + if (utils.isE2EBuild()) { + env.SAUCE_URL = ios.uploadToSauceLabs() + } else { + env.DIAWI_URL = ios.uploadToDiawi() } - } + } } } } } - stage('Cleanup') { - steps { - sh 'make watchman-clean' - sh 'make purge' - } - } } post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - always { sh 'make _fix-node-perms' } + always { sh 'make purge' } } } diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests new file mode 100644 index 0000000000..d90fe8b930 --- /dev/null +++ b/ci/Jenkinsfile.tests @@ -0,0 +1,77 @@ +library 'status-jenkins-lib@v1.5.0' + +/* Options section can't access functions in objects. */ +def isPRBuild = utils.isPRBuild() + +pipeline { + agent { label 'linux && x86_64 && nix-2.8' } + + options { + timestamps() + /* Prevent Jenkins jobs from running forever */ + timeout(time: 10, unit: 'MINUTES') + /* Limit builds retained */ + buildDiscarder(logRotator( + numToKeepStr: '10', + daysToKeepStr: '20', + artifactNumToKeepStr: '10', + )) + /* Abort old PR builds. */ + disableConcurrentBuilds( + abortPrevious: isPRBuild + ) + } + + parameters { + string( + name: 'BUILD_TYPE', + description: 'Specify build type. Values: pr / e2e / nightly / release', + defaultValue: 'pr', + ) + } + + environment { + LANG = "en_US.UTF-8" + LC_ALL = "en_US.UTF-8" + LANGUAGE = "en_US.UTF-8" + TARGET = 'tests' + BUILD_ENV = 'prod' + NIX_CONF_DIR = "${env.WORKSPACE}/nix" + LOG_FILE = utils.pkgFilename(ext: 'log', arch: 'tests') + } + + stages { + stage('Prep') { + steps { + script { + btype = utils.getBuildType() + print "Running ${btype} build!" + /* Cleanup and Prep */ + commonPrep(btype) + } + } + } + stage('Checks') { + parallel { + stage('Lint') { + steps { sh "make lint > ${LOG_FILE}" } + } + stage('Tests') { + steps { sh "make test >> ${LOG_FILE}" } + } + } + } + stage('Upload') { + steps { + script { + env.PKG_URL = s3.uploadArtifact(LOG_FILE) + } + } + } + } + post { + success { script { github.notifyPR(true) } } + failure { script { github.notifyPR(false) } } + always { sh 'make purge' } + } +} From 1b8aea87b2f39661e731a73b258f4ad20ea0b750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 24 Aug 2022 15:12:42 +0200 Subject: [PATCH 6/7] ci: use different IPFS gateway for release builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/status-im/status-go/compare/f43f43cc...86054875 Depends on: https://github.com/status-im/status-jenkins-lib/pull/44 Signed-off-by: Jakub Sokołowski --- ci/Jenkinsfile.android | 2 +- ci/Jenkinsfile.combined | 2 +- ci/Jenkinsfile.ios | 2 +- ci/Jenkinsfile.nix-cache | 2 +- ci/tests/Jenkinsfile.e2e-prs | 2 +- ci/tools/Jenkinsfile.fastlane-clean | 2 +- ci/tools/Jenkinsfile.playstore-meta | 2 +- nix/config.nix | 5 ++++- nix/status-go/default.nix | 4 +++- status-go-version.json | 6 +++--- 10 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index 4ee92f2525..8f51a11d79 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index c0c0bae498..22e398f6c5 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index 790a7ae789..9c7439039f 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.nix-cache b/ci/Jenkinsfile.nix-cache index 085f14cd27..7468b1ee0d 100644 --- a/ci/Jenkinsfile.nix-cache +++ b/ci/Jenkinsfile.nix-cache @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { agent { label params.AGENT_LABEL } diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs index 04b2985e78..f246c07def 100644 --- a/ci/tests/Jenkinsfile.e2e-prs +++ b/ci/tests/Jenkinsfile.e2e-prs @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean index a60948f0b2..737c4ab5b1 100644 --- a/ci/tools/Jenkinsfile.fastlane-clean +++ b/ci/tools/Jenkinsfile.fastlane-clean @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { agent { label 'macos' } diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta index 7fd11ae33d..247a7c44ce 100644 --- a/ci/tools/Jenkinsfile.playstore-meta +++ b/ci/tools/Jenkinsfile.playstore-meta @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { agent { label 'linux' } diff --git a/nix/config.nix b/nix/config.nix index 110b441448..0790641a22 100644 --- a/nix/config.nix +++ b/nix/config.nix @@ -12,7 +12,10 @@ abi-include = "armeabi-v7a;arm64-v8a;x86"; # Android architectures to build for }; - status-go = { src-override = null; }; + status-go = { + src-override = null; + ipfs-gateway-url = "https://ipfs.status.im/"; + }; }; # Android SDK requires an accepted license diff --git a/nix/status-go/default.nix b/nix/status-go/default.nix index 1c71ae5087..4de9a64786 100644 --- a/nix/status-go/default.nix +++ b/nix/status-go/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, mkShell }: let - inherit (lib) attrValues mapAttrs; + inherit (lib) getConfig attrValues mapAttrs; # Metadata common to all builds of status-go meta = { @@ -17,6 +17,8 @@ let goBuildParams = { GitCommit = source.rev; Version = source.cleanVersion; + # FIXME: This should be moved to status-go config. + IpfsGatewayURL = getConfig "status-go.ipfs-gateway-url" "https://ipfs.status.im/"; }; # These are necessary for status-go to show correct version diff --git a/status-go-version.json b/status-go-version.json index d0794a2410..20772ff012 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -3,7 +3,7 @@ "_comment": "Instead use: scripts/update-status-go.sh ", "owner": "status-im", "repo": "status-go", - "version": "v0.106.2", - "commit-sha1": "f43f43cc30e56d342cf8d25d2e0e56aecc83fa6e", - "src-sha256": "0j9xgkblv56h3vvkiwsy3wnwazs0fcs4z3f3mvlvs058vpdkv9hw" + "version": "v0.107.0", + "commit-sha1": "86054875a4f0296ed38858553448dfe92c14da9c", + "src-sha256": "1mw6v20h20g1zy30qs97ys2dv5nggzvdbfmdfygwvf3fj018yklg" } From 5df202753f01ccf16e86b5483c646c3bf6f94d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 26 Aug 2022 16:22:39 +0200 Subject: [PATCH 7/7] drop unused coveralls configuration and CI steps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Depends on: https://github.com/status-im/status-jenkins-lib/pull/45 Signed-off-by: Jakub Sokołowski --- Makefile | 4 ---- package.json | 1 - scripts/run-coverage.sh | 51 ----------------------------------------- yarn.lock | 21 ----------------- 4 files changed, 77 deletions(-) delete mode 100755 scripts/run-coverage.sh diff --git a/Makefile b/Makefile index 5478d9bdf8..ed713e1493 100644 --- a/Makefile +++ b/Makefile @@ -310,10 +310,6 @@ test: ##@test Run tests once in NodeJS yarn shadow-cljs compile test && \ node --require ./test-resources/override.js target/test/test.js - -coverage: ##@test Run tests once in NodeJS generating coverage - @scripts/run-coverage.sh - #-------------- # Other #-------------- diff --git a/package.json b/package.json index 7f13ce282c..13aa89c62c 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,6 @@ "@babel/register": "7.0.0", "@mapbox/node-pre-gyp": "^1.0.9", "clj-kondo": "^2020.1.13", - "coveralls": "^3.0.4", "jest": "^25.1.0", "nodemon": "^2.0.16", "nyc": "^14.1.1", diff --git a/scripts/run-coverage.sh b/scripts/run-coverage.sh deleted file mode 100755 index 36a034bbf9..0000000000 --- a/scripts/run-coverage.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -# Fail on first error -set -e - -TEST_JS=target/test/test.js -COVERAGE_REPORT=coverage-report/lcov.info - -rm -rf "${COVERAGE_REPORT}" - -RED='\033[0;31m' -GREEN='\033[0;32m' -YELLOW='\033[1;33m' -NC='\033[0m' - -if [ ! -f "$TEST_JS" ]; then - echo -e "${YELLOW}test suite not found, compiling and running...${NC}" - make test -else - echo -e "${YELLOW}test suite found.${NC}" -fi - -echo -e "${YELLOW}running test suite with coverage...${NC}" - -nyc node target/test/test.js - -echo -e "${GREEN}DONE.${NC}" - -if [ ! -f "$COVERAGE_REPORT" ]; then - echo -e "${RED}coverage report not generated! check nyc configuration file .nycrc${NC}" - exit 1 -fi - -## COVERALLS ENV ## - -# COVERALLS_REPO_TOKEN (the secret repo token from coveralls.io) - -# optionals ENV -# COVERALLS_SERVICE_NAME (the name of your build system, "jenkins" -# COVERALLS_SERVICE_JOB_ID - -if [ -z "$COVERALLS_REPO_TOKEN" ]; then - echo -e "${RED}COVERALLS_REPO_TOKEN not set!${NC}" - exit 1 -fi - -echo -e "${YELLOW}uploading coverage to coveralls...${NC}" - -cat coverage-report/lcov.info | coveralls - -echo -e "${GREEN}DONE.${NC}" \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 0e77411b15..175d256f5a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3370,17 +3370,6 @@ cosmiconfig@^5.0.5, cosmiconfig@^5.1.0: js-yaml "^3.13.1" parse-json "^4.0.0" -coveralls@^3.0.4: - version "3.0.13" - resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.13.tgz#64d8c99af3b8a771a2e6e5bcdf556c3c5061d29d" - integrity sha512-Bch6FJI4ebK6Mwr+DjFCJbb/RayNwn5pscSDE4Ux6cgjNkAcjdgGZBRfQnuYTt5tY81MqGK8m2r+xc5FDF513A== - dependencies: - js-yaml "^3.13.1" - lcov-parse "^1.0.0" - log-driver "^1.2.7" - minimist "^1.2.5" - request "^2.88.0" - cp-file@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" @@ -6058,11 +6047,6 @@ latest-version@^5.1.0: dependencies: package-json "^6.3.0" -lcov-parse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0" - integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A= - leven@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" @@ -6169,11 +6153,6 @@ lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.3. resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -log-driver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8" - integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg== - log-symbols@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"