From af29ed5f959c59af32dfee4b8e2b8b8b6b8b70b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9lio=20Rocha?= Date: Tue, 23 Jul 2024 11:37:45 +0100 Subject: [PATCH] bump codacy base orb --- .circleci/config.yml | 3 +-- get.sh | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb137402..0a4a58cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - codacy: codacy/base@12.1.1 + codacy: codacy/base@12.1.2 references: circleci_job: &circleci_job @@ -165,7 +165,6 @@ jobs: command: | brew install mockserver coreutils export CODACY_REPORTER_TMP_FOLDER=".codacy-coverage" - export CODACY_REPORTER_SKIP_CHECKSUM=true version=$(cat .version) mkdir -p $CODACY_REPORTER_TMP_FOLDER/$version cp $HOME/workdir/artifacts/codacy-coverage-reporter-darwin $CODACY_REPORTER_TMP_FOLDER/$version/codacy-coverage-reporter diff --git a/get.sh b/get.sh index 4c29e661..d063c197 100755 --- a/get.sh +++ b/get.sh @@ -129,7 +129,7 @@ download() { download_file "$url" checksum "$file_name" "$checksum_url" - if [ "$os_name_arch" = "Linux x86_64" ] || [ "$os_name_arch" = "Darwin x86_64" ]; then + if [ "$os_name_arch" = "Linux x86_64" ] || [ "$os_name_arch" = "Darwin arm64" ]; then mv "$file_name" "$output_filename" fi @@ -137,7 +137,7 @@ download() { } download_reporter() { - if [ "$os_name_arch" = "Linux x86_64" ] || [ "$os_name_arch" = "Darwin x86_64" ]; then + if [ "$os_name_arch" = "Linux x86_64" ] || [ "$os_name_arch" = "Darwin arm64" ]; then # OS name lower case suffix=$(echo "$os_name" | tr '[:upper:]' '[:lower:]') else @@ -203,7 +203,7 @@ if [ -z "$CODACY_REPORTER_TMP_FOLDER" ]; then fi # Set binary name -if [ "$os_name_arch" = "Linux x86_64" ] || [ "$os_name_arch" = "Darwin x86_64" ]; then +if [ "$os_name_arch" = "Linux x86_64" ] || [ "$os_name_arch" = "Darwin arm64" ]; then reporter_filename="codacy-coverage-reporter" else reporter_filename="codacy-coverage-reporter-assembly.jar" @@ -220,7 +220,7 @@ reporter_path="$reporter_folder"/"$reporter_filename" download_reporter "$reporter_path" "$reporter_folder" "$reporter_filename" -if [ "$os_name_arch" = "Linux x86_64" ] || [ "$os_name_arch" = "Darwin x86_64" ]; then +if [ "$os_name_arch" = "Linux x86_64" ] || [ "$os_name_arch" = "Darwin arm64" ]; then chmod +x "$reporter_path" run_command="$reporter_path" else