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