diff --git a/.circleci/config.yml b/.circleci/config.yml index c781fdc..ce7494e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,5 @@ version: 2.1 -orbs: - sdkman: joshdholtz/sdkman@0.2.0 - defaults: &defaults working_directory: ~/repo environment: @@ -18,10 +15,16 @@ commands: default: "build/reports/test_results" steps: - checkout - - sdkman/setup-sdkman - - sdkman/sdkman-install: - candidate: kotlin - version: 2.1.10 + - run: + name: Install SDKMAN! + command: | + curl -s "https://get.sdkman.io" | bash + echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config + echo sdkman_auto_selfupdate=true >> $HOME/.sdkman/etc/config + source "$HOME/.sdkman/bin/sdkman-init.sh" + sdk install java + sdk install kotlin + source "$HOME/.sdkman/bin/sdkman-init.sh" - run: name: Download dependencies command: ./bld download diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 8e7d939..37437fd 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -7,8 +7,10 @@ env: CHATGPT_API_KEY: ${{ secrets.CHATGPT_API_KEY }} CI_NAME: "GitHub CI" COVERAGE_JDK: "21" - COVERAGE_KOTLIN: "2.1.0" + COVERAGE_KOTLIN: "2.1.20" EXCHANGERATE_API_KEY: ${{ secrets.EXCHANGERATE_API_KEY }} + GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }} + GOOGLE_CSE_CX: ${{ secrets.GOOGLE_CSE_CX }} KOTLIN_HOME: /usr/share/kotlinc MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }} MASTODON_HANDLE: ${{ secrets.MASTODON_HANDLE }}