From f4519f12f656cb7865e71feb1af56d5b7e80d558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Thu, 5 Sep 2024 15:27:44 +0200 Subject: [PATCH 01/32] remove tmp cache --- .circleci/config.yml | 81 -------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d769c0b1d..629280fa4b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,10 +128,6 @@ jobs: # https://discuss.circleci.com/t/git-submodule-url-isnt-playing-nice-with-the-cache/549/3 name: Git Submodules. command: (git submodule sync && git submodule update --init --recursive) || (rm -fr .git/config .git/modules && git submodule deinit -f . && git submodule update --init --recursive) - - restore_cache: - keys: - - v3-dev-bundle-cache-{{ checksum "meteor" }} - - v3-dev-bundle-cache- - run: name: Combine NPM Shrinkwrap Files command: | @@ -145,23 +141,6 @@ jobs: cat $d/npm-shrinkwrap.json >> shrinkwraps.txt; fi done - - restore_cache: - keys: - - package-npm-deps-cache-group1-v3-{{ checksum "shrinkwraps.txt" }} - - package-npm-deps-cache-group1-v3- - - restore_cache: - keys: - - package-npm-deps-cache-group2-v6-{{ checksum "shrinkwraps.txt" }} - - package-npm-deps-cache-group2-v6- - - restore_cache: - keys: - - v7-other-deps-cache-{{ .Branch }}-{{ checksum "meteor" }}-{{ .Revision }} - - v7-other-deps-cache-{{ .Branch }}-{{ checksum "meteor" }}- - - v7-other-deps-cache-{{ .Branch }}- - - restore_cache: - keys: - - v4-test-groups-{{ .Branch }} - - v4-test-groups- - run: name: Create Test Results Directory command: | @@ -789,66 +768,6 @@ jobs: command: | npm install --prefix ./scripts/test-balancer npm start --prefix ./scripts/test-balancer --num-groups ${NUM_GROUPS} --running-avg-length ${RUNNING_AVG_LENGTH} - - save_cache: - key: v1-test-groups-{{ .Branch }}-{{ .BuildNum }} - paths: - - ./tmp/test-groups - when: on_success - - save_cache: - key: v3-dev-bundle-cache-{{ checksum "meteor" }} - paths: - - "dev_bundle" - # The package npm dependencies are split into two caches to avoid an AWS - # `MetadataTooLarge` error that consistently appears if we put all of - # these folders in the same cache - - save_cache: - key: package-npm-deps-cache-group1-v3-{{ checksum "shrinkwraps.txt" }} - paths: - - packages/meteor/.npm/package/node_modules - - packages/modules-runtime/.npm/package/node_modules - - packages/modules/.npm/package/node_modules - - packages/ecmascript-runtime-server/.npm/package/node_modules - - packages/promise/.npm/package/node_modules - - packages/babel-compiler/.npm/package/node_modules - - packages/babel-runtime/.npm/package/node_modules - - packages/http/.npm/package/node_modules - - packages/socket-stream-client/.npm/package/node_modules - - packages/ddp-client/.npm/package/node_modules - - packages/npm-mongo/.npm/package/node_modules - - packages/package-version-parser/.npm/package/node_modules - - packages/boilerplate-generator/.npm/package/node_modules - - save_cache: - key: package-npm-deps-cache-group2-v5-{{ checksum "shrinkwraps.txt" }} - paths: - - packages/xmlbuilder/.npm/package/node_modules - - packages/logging/.npm/package/node_modules - - packages/webapp/.npm/package/node_modules - - packages/ddp-server/.npm/package/node_modules - - packages/mongo/.npm/package/node_modules - - packages/npm-bcrypt/.npm/package/node_modules - - packages/email/.npm/package/node_modules - - packages/caching-compiler/.npm/package/node_modules - - packages/less/.npm/plugin/compileLessBatch/node_modules - - packages/non-core/blaze/packages/spacebars-compiler/.npm/package/node_modules - - packages/boilerplate-generator-tests/.npm/package/node_modules - - packages/non-core/bundle-visualizer/.npm/package/node_modules - - packages/d3-hierarchy/.npm/package/node_modules - - packages/non-core/coffeescript-compiler/.npm/package/node_modules - - packages/server-render/.npm/package/node_modules - - packages/es5-shim/.npm/package/node_modules - - packages/force-ssl-common/.npm/package/node_modules - - packages/jshint/.npm/plugin/lintJshint/node_modules - - packages/minifier-css/.npm/package/node_modules - - packages/minifier-js/.npm/package/node_modules - - packages/standard-minifier-css/.npm/plugin/minifyStdCSS/node_modules - - packages/inter-process-messaging/.npm/package/node_modules - - packages/fetch/.npm/package/node_modules - - packages/non-core/mongo-decimal/.npm/package/node_modules - - save_cache: - key: v7-other-deps-cache-{{ .Branch }}-{{ checksum "meteor" }}-{{ .Revision }} - paths: - - ".babel-cache" - - ".meteor" workflows: version: 2 From b39fe8d45e6a0a0b43c3dc832e6df73959120945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Thu, 5 Sep 2024 15:47:18 +0200 Subject: [PATCH 02/32] Revert "remove tmp cache" This reverts commit f4519f12f656cb7865e71feb1af56d5b7e80d558. --- .circleci/config.yml | 81 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 629280fa4b..5d769c0b1d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,6 +128,10 @@ jobs: # https://discuss.circleci.com/t/git-submodule-url-isnt-playing-nice-with-the-cache/549/3 name: Git Submodules. command: (git submodule sync && git submodule update --init --recursive) || (rm -fr .git/config .git/modules && git submodule deinit -f . && git submodule update --init --recursive) + - restore_cache: + keys: + - v3-dev-bundle-cache-{{ checksum "meteor" }} + - v3-dev-bundle-cache- - run: name: Combine NPM Shrinkwrap Files command: | @@ -141,6 +145,23 @@ jobs: cat $d/npm-shrinkwrap.json >> shrinkwraps.txt; fi done + - restore_cache: + keys: + - package-npm-deps-cache-group1-v3-{{ checksum "shrinkwraps.txt" }} + - package-npm-deps-cache-group1-v3- + - restore_cache: + keys: + - package-npm-deps-cache-group2-v6-{{ checksum "shrinkwraps.txt" }} + - package-npm-deps-cache-group2-v6- + - restore_cache: + keys: + - v7-other-deps-cache-{{ .Branch }}-{{ checksum "meteor" }}-{{ .Revision }} + - v7-other-deps-cache-{{ .Branch }}-{{ checksum "meteor" }}- + - v7-other-deps-cache-{{ .Branch }}- + - restore_cache: + keys: + - v4-test-groups-{{ .Branch }} + - v4-test-groups- - run: name: Create Test Results Directory command: | @@ -768,6 +789,66 @@ jobs: command: | npm install --prefix ./scripts/test-balancer npm start --prefix ./scripts/test-balancer --num-groups ${NUM_GROUPS} --running-avg-length ${RUNNING_AVG_LENGTH} + - save_cache: + key: v1-test-groups-{{ .Branch }}-{{ .BuildNum }} + paths: + - ./tmp/test-groups + when: on_success + - save_cache: + key: v3-dev-bundle-cache-{{ checksum "meteor" }} + paths: + - "dev_bundle" + # The package npm dependencies are split into two caches to avoid an AWS + # `MetadataTooLarge` error that consistently appears if we put all of + # these folders in the same cache + - save_cache: + key: package-npm-deps-cache-group1-v3-{{ checksum "shrinkwraps.txt" }} + paths: + - packages/meteor/.npm/package/node_modules + - packages/modules-runtime/.npm/package/node_modules + - packages/modules/.npm/package/node_modules + - packages/ecmascript-runtime-server/.npm/package/node_modules + - packages/promise/.npm/package/node_modules + - packages/babel-compiler/.npm/package/node_modules + - packages/babel-runtime/.npm/package/node_modules + - packages/http/.npm/package/node_modules + - packages/socket-stream-client/.npm/package/node_modules + - packages/ddp-client/.npm/package/node_modules + - packages/npm-mongo/.npm/package/node_modules + - packages/package-version-parser/.npm/package/node_modules + - packages/boilerplate-generator/.npm/package/node_modules + - save_cache: + key: package-npm-deps-cache-group2-v5-{{ checksum "shrinkwraps.txt" }} + paths: + - packages/xmlbuilder/.npm/package/node_modules + - packages/logging/.npm/package/node_modules + - packages/webapp/.npm/package/node_modules + - packages/ddp-server/.npm/package/node_modules + - packages/mongo/.npm/package/node_modules + - packages/npm-bcrypt/.npm/package/node_modules + - packages/email/.npm/package/node_modules + - packages/caching-compiler/.npm/package/node_modules + - packages/less/.npm/plugin/compileLessBatch/node_modules + - packages/non-core/blaze/packages/spacebars-compiler/.npm/package/node_modules + - packages/boilerplate-generator-tests/.npm/package/node_modules + - packages/non-core/bundle-visualizer/.npm/package/node_modules + - packages/d3-hierarchy/.npm/package/node_modules + - packages/non-core/coffeescript-compiler/.npm/package/node_modules + - packages/server-render/.npm/package/node_modules + - packages/es5-shim/.npm/package/node_modules + - packages/force-ssl-common/.npm/package/node_modules + - packages/jshint/.npm/plugin/lintJshint/node_modules + - packages/minifier-css/.npm/package/node_modules + - packages/minifier-js/.npm/package/node_modules + - packages/standard-minifier-css/.npm/plugin/minifyStdCSS/node_modules + - packages/inter-process-messaging/.npm/package/node_modules + - packages/fetch/.npm/package/node_modules + - packages/non-core/mongo-decimal/.npm/package/node_modules + - save_cache: + key: v7-other-deps-cache-{{ .Branch }}-{{ checksum "meteor" }}-{{ .Revision }} + paths: + - ".babel-cache" + - ".meteor" workflows: version: 2 From a029d8ca18f31bacd97b9db0943df78794020d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 14:29:15 +0200 Subject: [PATCH 03/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/cordova.yml diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml new file mode 100644 index 0000000000..aff1742d5e --- /dev/null +++ b/.github/workflows/cordova.yml @@ -0,0 +1,31 @@ +name: Meteor Cordova selftest + +on: + pull_request: + types: + - opened + - reopened + - synchronize + push: + branches: + - devel + - 2.x.x + +jobs: + build: + runs-on: ubuntu-latest + + container: + image: meteor/circleci:2024.09.2-android-34-node-20 + options: --entrypoint "/bin/bash" + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Run a script inside the custom Docker image + run: | + echo "Ready to test cordova!" + ls + java --version + printenv From 66f751742e66ce75e3a8e48feabd11dfb7b2f0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 14:35:31 +0200 Subject: [PATCH 04/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index aff1742d5e..b287fbd03e 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -1,4 +1,4 @@ -name: Meteor Cordova selftest +name: Meteor Selftest Cordova on: pull_request: @@ -23,9 +23,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Run a script inside the custom Docker image + - name: Test Cordova run: | - echo "Ready to test cordova!" - ls java --version - printenv + ./meteor self-test ^cordova From 92f1016159a480d4aedda7bc353a054500016674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 14:47:27 +0200 Subject: [PATCH 05/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index b287fbd03e..c6b44b1cc6 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -25,5 +25,6 @@ jobs: - name: Test Cordova run: | + source "/home/circleci/.sdkman/bin/sdkman-init.sh" && sdk install gradle 8.7 java --version ./meteor self-test ^cordova From 8995b31891c68b611bf4f06e069679f2350e67d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 14:48:01 +0200 Subject: [PATCH 06/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index c6b44b1cc6..bf66fe4794 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -27,4 +27,5 @@ jobs: run: | source "/home/circleci/.sdkman/bin/sdkman-init.sh" && sdk install gradle 8.7 java --version + gradle --version ./meteor self-test ^cordova From 00268829d10597d7699d5b54630d8d0bfbf53429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 14:53:34 +0200 Subject: [PATCH 07/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index bf66fe4794..44ec2c7cc9 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -25,7 +25,7 @@ jobs: - name: Test Cordova run: | - source "/home/circleci/.sdkman/bin/sdkman-init.sh" && sdk install gradle 8.7 + . "/home/circleci/.sdkman/bin/sdkman-init.sh" && sdk install gradle 8.7 java --version gradle --version ./meteor self-test ^cordova From 46c672355a70bd105b245e5d30def9c51978110c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 14:57:24 +0200 Subject: [PATCH 08/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 44ec2c7cc9..f5c653567f 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -25,7 +25,7 @@ jobs: - name: Test Cordova run: | - . "/home/circleci/.sdkman/bin/sdkman-init.sh" && sdk install gradle 8.7 + sdk install gradle 8.7 java --version gradle --version ./meteor self-test ^cordova From 208f665b94ee82f4dfd21c63d2c2dcc6430de01b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 15:00:46 +0200 Subject: [PATCH 09/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index f5c653567f..0a7b612b5a 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -25,6 +25,7 @@ jobs: - name: Test Cordova run: | + /home/circleci/.sdkman/bin/sdkman-init.sh sdk install gradle 8.7 java --version gradle --version From 272af65422ad1587ad2316328919addecb1c9a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 15:06:25 +0200 Subject: [PATCH 10/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 0a7b612b5a..3a683b1a38 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -25,8 +25,6 @@ jobs: - name: Test Cordova run: | - /home/circleci/.sdkman/bin/sdkman-init.sh - sdk install gradle 8.7 java --version gradle --version ./meteor self-test ^cordova From c2a453a9ed668ec3ac71a3f486542f929bc6b11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 15:25:25 +0200 Subject: [PATCH 11/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 3a683b1a38..f58b59df82 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -25,6 +25,7 @@ jobs: - name: Test Cordova run: | + whoami java --version gradle --version ./meteor self-test ^cordova From f47034f254dfd7fd7cb82131bd697d9f7c24a130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 15:28:01 +0200 Subject: [PATCH 12/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index f58b59df82..429a6b6973 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -26,6 +26,8 @@ jobs: - name: Test Cordova run: | whoami + curl -s "https://get.sdkman.io" | bash + bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7" java --version gradle --version ./meteor self-test ^cordova From 63d874394666f5803457febc87f9a6ec4574a9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 16:53:49 +0200 Subject: [PATCH 13/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 429a6b6973..a3e8cdd9c8 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -27,7 +27,7 @@ jobs: run: | whoami curl -s "https://get.sdkman.io" | bash - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7" + bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7 && sdk use gradle 8.7 && gradle --version" java --version gradle --version ./meteor self-test ^cordova From 2589db7c7c88f425011c271ebad9138c29974440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 16:59:42 +0200 Subject: [PATCH 14/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index a3e8cdd9c8..ee8570c36e 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -28,6 +28,7 @@ jobs: whoami curl -s "https://get.sdkman.io" | bash bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7 && sdk use gradle 8.7 && gradle --version" + cd .. java --version gradle --version ./meteor self-test ^cordova From 2d5637b0bffc94061d46e4f68a2e81d7a4ee0951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 17:12:33 +0200 Subject: [PATCH 15/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index ee8570c36e..a0389561ef 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -20,9 +20,6 @@ jobs: options: --entrypoint "/bin/bash" steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Test Cordova run: | whoami From 0107e2837428ba2c3f039755a3caccd2a8c67a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 17:17:27 +0200 Subject: [PATCH 16/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index a0389561ef..8b52037a28 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -20,12 +20,16 @@ jobs: options: --entrypoint "/bin/bash" steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Test Cordova run: | whoami curl -s "https://get.sdkman.io" | bash bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7 && sdk use gradle 8.7 && gradle --version" cd .. + /home/circleci/.sdkman/candidates/gradle/current/bin/gradle --version java --version gradle --version ./meteor self-test ^cordova From 936d3ac20151bb03bf39be8e86c84cadd7ef2530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 17:20:32 +0200 Subject: [PATCH 17/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 8b52037a28..0859b6490c 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -29,7 +29,10 @@ jobs: curl -s "https://get.sdkman.io" | bash bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7 && sdk use gradle 8.7 && gradle --version" cd .. + ls /home/circleci/.sdkman/candidates/gradle /home/circleci/.sdkman/candidates/gradle/current/bin/gradle --version java --version + which gradle gradle --version + echo $PATH ./meteor self-test ^cordova From da4e2326266bd469f4a746531f730a854811dbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 17:28:20 +0200 Subject: [PATCH 18/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 0859b6490c..b97946218f 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -25,10 +25,10 @@ jobs: - name: Test Cordova run: | + export PATH="/usr/local/gradle-8.9/bin:${PATH}" whoami curl -s "https://get.sdkman.io" | bash bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7 && sdk use gradle 8.7 && gradle --version" - cd .. ls /home/circleci/.sdkman/candidates/gradle /home/circleci/.sdkman/candidates/gradle/current/bin/gradle --version java --version From 86ca3aa9c3373e24be4cbf3a9bc5c53da7f3eb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 17:49:38 +0200 Subject: [PATCH 19/32] use new image that include path fixing for ci --- .circleci/config.yml | 4 ++-- .github/workflows/cordova.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d769c0b1d..e774c280b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,7 +79,7 @@ run_save_node_bin: &run_save_node_bin build_machine_environment: &build_machine_environment # Specify that we want an actual machine (ala Circle 1.0), not a Docker image. docker: - - image: meteor/circleci:2024.09.2-android-34-node-20 + - image: meteor/circleci:2024.09.9-android-34-node-20 resource_class: large environment: # This multiplier scales the waitSecs for selftests. @@ -750,7 +750,7 @@ jobs: Docs: docker: # This Node version should match that in the meteor/docs CircleCI config. - - image: meteor/circleci:2024.09.2-android-34-node-20 + - image: meteor/circleci:2024.09.9-android-34-node-20 resource_class: large environment: CHECKOUT_METEOR_DOCS: /home/circleci/test_docs diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index b97946218f..aaf80664a7 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest container: - image: meteor/circleci:2024.09.2-android-34-node-20 + image: meteor/circleci:2024.09.9-android-34-node-20 options: --entrypoint "/bin/bash" steps: From b65f1715001dada5f54d67ec277d42b70f2dbd75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 18:07:45 +0200 Subject: [PATCH 20/32] debug --- .circleci/config.yml | 3 +++ .github/workflows/cordova.yml | 29 +++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e774c280b1..d3ad5245c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -345,6 +345,9 @@ jobs: if [ -f ./tmp/test-groups/2.txt ]; then TEST_GROUP=$(<./tmp/test-groups/2.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^co[n-z]'; fi echo $TEST_GROUP; eval $PRE_TEST_COMMANDS; + gradle --version + echo $PATH + export PATH="/usr/local/gradle-8.7/bin:${PATH}" ./meteor self-test \ "$TEST_GROUP" \ --retries ${METEOR_SELF_TEST_RETRIES} \ diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index aaf80664a7..6d3fd4f7c2 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -11,6 +11,27 @@ on: - devel - 2.x.x +env: + # This multiplier scales the waitSecs for selftests. + TIMEOUT_SCALE_FACTOR: 8 + + # Retry failed tests additional times. + METEOR_SELF_TEST_RETRIES: 2 + + # These, mostly overlapping, flags ensure that CircleCI is as pretty as + # possible for a non-interactive environment. See also: --headless. + METEOR_HEADLESS: true + METEOR_PRETTY_OUTPUT: 0 + + # In an effort to stop SIGSEGV, this just doesn't bother cleaning up + # the mess of temp directories that Meteor makes. + METEOR_SAVE_TMPDIRS: 1 + + # Skip these tests on every test run. + # If needed, for readability this should be a regex wrapped across + # multiple lines in quotes. + SELF_TEST_EXCLUDE: "add debugOnly and prodOnly packages" + jobs: build: runs-on: ubuntu-latest @@ -25,14 +46,6 @@ jobs: - name: Test Cordova run: | - export PATH="/usr/local/gradle-8.9/bin:${PATH}" - whoami - curl -s "https://get.sdkman.io" | bash - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7 && sdk use gradle 8.7 && gradle --version" - ls /home/circleci/.sdkman/candidates/gradle - /home/circleci/.sdkman/candidates/gradle/current/bin/gradle --version java --version - which gradle gradle --version - echo $PATH ./meteor self-test ^cordova From 2c896e9a9c02f9d1e29f7a2811658a7766079dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 18:28:08 +0200 Subject: [PATCH 21/32] export path on ci --- .circleci/config.yml | 3 +-- .github/workflows/cordova.yml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d3ad5245c1..a64052ec12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -345,9 +345,8 @@ jobs: if [ -f ./tmp/test-groups/2.txt ]; then TEST_GROUP=$(<./tmp/test-groups/2.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^co[n-z]'; fi echo $TEST_GROUP; eval $PRE_TEST_COMMANDS; - gradle --version - echo $PATH export PATH="/usr/local/gradle-8.7/bin:${PATH}" + gradle --version ./meteor self-test \ "$TEST_GROUP" \ --retries ${METEOR_SELF_TEST_RETRIES} \ diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 6d3fd4f7c2..ec65a27be3 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -46,6 +46,7 @@ jobs: - name: Test Cordova run: | + export PATH="/usr/local/gradle-8.7/bin:${PATH}" java --version gradle --version ./meteor self-test ^cordova From 2390538333349533d9ddd5fe5ffdcc7185900756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 18:40:48 +0200 Subject: [PATCH 22/32] implement basic new job to test cordova --- .circleci/config.yml | 1 + .github/workflows/cordova.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a64052ec12..5270d0666c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -345,6 +345,7 @@ jobs: if [ -f ./tmp/test-groups/2.txt ]; then TEST_GROUP=$(<./tmp/test-groups/2.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^co[n-z]'; fi echo $TEST_GROUP; eval $PRE_TEST_COMMANDS; + ls /home/circleci/.sdkman/candidates/gradle export PATH="/usr/local/gradle-8.7/bin:${PATH}" gradle --version ./meteor self-test \ diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index ec65a27be3..8d1d49df4d 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -46,6 +46,7 @@ jobs: - name: Test Cordova run: | + ls /home/circleci/.sdkman/candidates/gradle export PATH="/usr/local/gradle-8.7/bin:${PATH}" java --version gradle --version From d5aca1a2b456ca18f3ead74c3e623986c3268330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 18:51:04 +0200 Subject: [PATCH 23/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 8d1d49df4d..30fe973e0c 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -18,20 +18,6 @@ env: # Retry failed tests additional times. METEOR_SELF_TEST_RETRIES: 2 - # These, mostly overlapping, flags ensure that CircleCI is as pretty as - # possible for a non-interactive environment. See also: --headless. - METEOR_HEADLESS: true - METEOR_PRETTY_OUTPUT: 0 - - # In an effort to stop SIGSEGV, this just doesn't bother cleaning up - # the mess of temp directories that Meteor makes. - METEOR_SAVE_TMPDIRS: 1 - - # Skip these tests on every test run. - # If needed, for readability this should be a regex wrapped across - # multiple lines in quotes. - SELF_TEST_EXCLUDE: "add debugOnly and prodOnly packages" - jobs: build: runs-on: ubuntu-latest From 5c88d580d07a58a012c16bd35fc1abb7fbf55318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 19:00:14 +0200 Subject: [PATCH 24/32] implement basic new job to test cordova --- .circleci/config.yml | 1 + .github/workflows/cordova.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5270d0666c..9f871ef6b6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -348,6 +348,7 @@ jobs: ls /home/circleci/.sdkman/candidates/gradle export PATH="/usr/local/gradle-8.7/bin:${PATH}" gradle --version + echo $PATH ./meteor self-test \ "$TEST_GROUP" \ --retries ${METEOR_SELF_TEST_RETRIES} \ diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 30fe973e0c..08d9aaf577 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -36,4 +36,5 @@ jobs: export PATH="/usr/local/gradle-8.7/bin:${PATH}" java --version gradle --version + echo $PATH ./meteor self-test ^cordova From 70027984cae6dead4aae5235094b7b01019692e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 19:05:19 +0200 Subject: [PATCH 25/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 08d9aaf577..15bb0c9127 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -34,6 +34,8 @@ jobs: run: | ls /home/circleci/.sdkman/candidates/gradle export PATH="/usr/local/gradle-8.7/bin:${PATH}" + curl -s "https://get.sdkman.io" | bash + bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7 && sdk use gradle 8.7 && gradle --version" java --version gradle --version echo $PATH From ea83b157843734f6c127dac8212e8f0513b36ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 19:10:22 +0200 Subject: [PATCH 26/32] implement basic new job to test cordova --- .github/workflows/cordova.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 15bb0c9127..25ad07f285 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -37,6 +37,6 @@ jobs: curl -s "https://get.sdkman.io" | bash bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7 && sdk use gradle 8.7 && gradle --version" java --version - gradle --version + PATH="/usr/local/gradle-8.7/bin:${PATH}" gradle --version echo $PATH - ./meteor self-test ^cordova + PATH="/usr/local/gradle-8.7/bin:${PATH}" ./meteor self-test ^cordova From b4779d98677b1f4e62a153e5a3ac17854ffa7427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 19:18:36 +0200 Subject: [PATCH 27/32] implement basic new job to test cordova --- .circleci/config.yml | 7 +++---- .github/workflows/cordova.yml | 10 +++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f871ef6b6..7f43cabb5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,7 +79,7 @@ run_save_node_bin: &run_save_node_bin build_machine_environment: &build_machine_environment # Specify that we want an actual machine (ala Circle 1.0), not a Docker image. docker: - - image: meteor/circleci:2024.09.9-android-34-node-20 + - image: meteor/circleci:2024.09.10-android-34-node-20 resource_class: large environment: # This multiplier scales the waitSecs for selftests. @@ -345,8 +345,7 @@ jobs: if [ -f ./tmp/test-groups/2.txt ]; then TEST_GROUP=$(<./tmp/test-groups/2.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^co[n-z]'; fi echo $TEST_GROUP; eval $PRE_TEST_COMMANDS; - ls /home/circleci/.sdkman/candidates/gradle - export PATH="/usr/local/gradle-8.7/bin:${PATH}" + java --version gradle --version echo $PATH ./meteor self-test \ @@ -754,7 +753,7 @@ jobs: Docs: docker: # This Node version should match that in the meteor/docs CircleCI config. - - image: meteor/circleci:2024.09.9-android-34-node-20 + - image: meteor/circleci:2024.09.10-android-34-node-20 resource_class: large environment: CHECKOUT_METEOR_DOCS: /home/circleci/test_docs diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 25ad07f285..d107635dc7 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest container: - image: meteor/circleci:2024.09.9-android-34-node-20 + image: meteor/circleci:2024.09.10-android-34-node-20 options: --entrypoint "/bin/bash" steps: @@ -32,11 +32,7 @@ jobs: - name: Test Cordova run: | - ls /home/circleci/.sdkman/candidates/gradle - export PATH="/usr/local/gradle-8.7/bin:${PATH}" - curl -s "https://get.sdkman.io" | bash - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle 8.7 && sdk use gradle 8.7 && gradle --version" java --version - PATH="/usr/local/gradle-8.7/bin:${PATH}" gradle --version + gradle --version echo $PATH - PATH="/usr/local/gradle-8.7/bin:${PATH}" ./meteor self-test ^cordova + ./meteor self-test ^cordova From c728846a7b97c4bce7d50ec81ffda603b244e082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 19:25:05 +0200 Subject: [PATCH 28/32] re-export path with proper route exported on new image --- .circleci/config.yml | 1 + .github/workflows/cordova.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f43cabb5d..d4c61f6bfe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -345,6 +345,7 @@ jobs: if [ -f ./tmp/test-groups/2.txt ]; then TEST_GROUP=$(<./tmp/test-groups/2.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^co[n-z]'; fi echo $TEST_GROUP; eval $PRE_TEST_COMMANDS; + export PATH="/usr/local/gradle/8.7/bin:${PATH}" java --version gradle --version echo $PATH diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index d107635dc7..8dcdc134fd 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -32,6 +32,7 @@ jobs: - name: Test Cordova run: | + export PATH="/usr/local/gradle/8.7/bin:${PATH}" java --version gradle --version echo $PATH From 9719a0b860a9cf989ffa29e2a5e92159a8eb8ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 19:32:10 +0200 Subject: [PATCH 29/32] new image --- .circleci/config.yml | 5 ++--- .github/workflows/cordova.yml | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d4c61f6bfe..f8c65c2bc1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,7 +79,7 @@ run_save_node_bin: &run_save_node_bin build_machine_environment: &build_machine_environment # Specify that we want an actual machine (ala Circle 1.0), not a Docker image. docker: - - image: meteor/circleci:2024.09.10-android-34-node-20 + - image: meteor/circleci:2024.09.11-android-34-node-20 resource_class: large environment: # This multiplier scales the waitSecs for selftests. @@ -345,7 +345,6 @@ jobs: if [ -f ./tmp/test-groups/2.txt ]; then TEST_GROUP=$(<./tmp/test-groups/2.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^co[n-z]'; fi echo $TEST_GROUP; eval $PRE_TEST_COMMANDS; - export PATH="/usr/local/gradle/8.7/bin:${PATH}" java --version gradle --version echo $PATH @@ -754,7 +753,7 @@ jobs: Docs: docker: # This Node version should match that in the meteor/docs CircleCI config. - - image: meteor/circleci:2024.09.10-android-34-node-20 + - image: meteor/circleci:2024.09.11-android-34-node-20 resource_class: large environment: CHECKOUT_METEOR_DOCS: /home/circleci/test_docs diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 8dcdc134fd..5080736776 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest container: - image: meteor/circleci:2024.09.10-android-34-node-20 + image: meteor/circleci:2024.09.11-android-34-node-20 options: --entrypoint "/bin/bash" steps: @@ -32,7 +32,6 @@ jobs: - name: Test Cordova run: | - export PATH="/usr/local/gradle/8.7/bin:${PATH}" java --version gradle --version echo $PATH From 7405ccaa9ecc6eb167404ac67c98aec2d97cedfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 19:37:41 +0200 Subject: [PATCH 30/32] add proper path from sdk --- .circleci/config.yml | 1 + .github/workflows/cordova.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f8c65c2bc1..a0d85d1b25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -726,6 +726,7 @@ jobs: if [ -f ./tmp/test-groups/11.txt ]; then TEST_GROUP=$(<./tmp/test-groups/11.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^[d-g]'; fi echo $TEST_GROUP; eval $PRE_TEST_COMMANDS; + export PATH="/home/circleci/.sdkman/candidates/gradle/8.7/bin:${PATH}" ./meteor self-test \ "$TEST_GROUP" \ --retries ${METEOR_SELF_TEST_RETRIES} \ diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml index 5080736776..6486bf9113 100644 --- a/.github/workflows/cordova.yml +++ b/.github/workflows/cordova.yml @@ -32,6 +32,7 @@ jobs: - name: Test Cordova run: | + export PATH="/home/circleci/.sdkman/candidates/gradle/8.7/bin:${PATH}" java --version gradle --version echo $PATH From de84162680812e1ec667c316e4548a39e07ae86f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 20:06:31 +0200 Subject: [PATCH 31/32] implement basic new job to test cordova --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0d85d1b25..465e2bf9e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -345,6 +345,7 @@ jobs: if [ -f ./tmp/test-groups/2.txt ]; then TEST_GROUP=$(<./tmp/test-groups/2.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^co[n-z]'; fi echo $TEST_GROUP; eval $PRE_TEST_COMMANDS; + export PATH="/home/circleci/.sdkman/candidates/gradle/8.7/bin:${PATH}" java --version gradle --version echo $PATH @@ -726,7 +727,6 @@ jobs: if [ -f ./tmp/test-groups/11.txt ]; then TEST_GROUP=$(<./tmp/test-groups/11.txt); elif [ -f ./tmp/test-groups/0.txt ]; then TEST_GROUP=XXXXX; else TEST_GROUP='^[d-g]'; fi echo $TEST_GROUP; eval $PRE_TEST_COMMANDS; - export PATH="/home/circleci/.sdkman/candidates/gradle/8.7/bin:${PATH}" ./meteor self-test \ "$TEST_GROUP" \ --retries ${METEOR_SELF_TEST_RETRIES} \ From 331a02aed676caf99735ad1f7c765e57cfc152ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 9 Sep 2024 20:21:33 +0200 Subject: [PATCH 32/32] cleanup dont need GA job still use circleci with proper config --- .circleci/config.yml | 1 - .github/workflows/cordova.yml | 39 ----------------------------------- 2 files changed, 40 deletions(-) delete mode 100644 .github/workflows/cordova.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 465e2bf9e2..62b5e0a3aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -348,7 +348,6 @@ jobs: export PATH="/home/circleci/.sdkman/candidates/gradle/8.7/bin:${PATH}" java --version gradle --version - echo $PATH ./meteor self-test \ "$TEST_GROUP" \ --retries ${METEOR_SELF_TEST_RETRIES} \ diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml deleted file mode 100644 index 6486bf9113..0000000000 --- a/.github/workflows/cordova.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Meteor Selftest Cordova - -on: - pull_request: - types: - - opened - - reopened - - synchronize - push: - branches: - - devel - - 2.x.x - -env: - # This multiplier scales the waitSecs for selftests. - TIMEOUT_SCALE_FACTOR: 8 - - # Retry failed tests additional times. - METEOR_SELF_TEST_RETRIES: 2 - -jobs: - build: - runs-on: ubuntu-latest - - container: - image: meteor/circleci:2024.09.11-android-34-node-20 - options: --entrypoint "/bin/bash" - - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Test Cordova - run: | - export PATH="/home/circleci/.sdkman/candidates/gradle/8.7/bin:${PATH}" - java --version - gradle --version - echo $PATH - ./meteor self-test ^cordova