Merge pull request #476 from codacy/bump/sh-version-13

bump: to 13.13.9 for SH release 13.0.0
codacy · Nov 3, 2023 · 9a5836d · 9a5836d
2 parents 590a6cb + 335461e
commit 9a5836d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,17 +1,12 @@
 version: 2.1
 
 orbs:
-  codacy: codacy/base@10.2.3
+  codacy: codacy/base@10.10.0
 
 references:
   circleci_job: &circleci_job
     docker:
-      - image: circleci/circleci-cli:0.1.28084
-    working_directory: ~/workdir
-
-  default_machine_job: &default_machine_job
-    machine:
-      image: ubuntu-2004:202201-02
+      - image: circleci/circleci-cli:0.1.29041
     working_directory: ~/workdir
 
 commands:
@@ -43,7 +38,8 @@ commands:
 
 jobs:
   publish_circleci_artifacts:
-    machine: true
+    machine: 
+      image: ubuntu-2004:current
     working_directory: ~/workdir
     steps:
       - attach_workspace:
@@ -76,7 +72,7 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/workdir
-      - deploy:
+      - run:
           name: Publish orb as dev (deleted after 90 days)
           command: circleci orb publish orb.yml codacy/coverage-reporter@dev:$(cat .version) --token $CIRCLE_TOKEN
 
@@ -85,16 +81,16 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/workdir
-      - deploy:
+      - run:
           name: Publish final orb
           command: circleci orb publish orb.yml codacy/coverage-reporter@$(cat .version) --token $CIRCLE_TOKEN
 
   package_artifacts:
     docker:
-      - image: hairyhenderson/upx:3.94
+      - image: alpine:3.18
     working_directory: ~/workdir
     steps:
-      - run: apk add ca-certificates
+      - run: apk add upx
       - attach_workspace:
           at: ~/workdir
       - run: |
@@ -103,16 +99,16 @@ jobs:
           upx --lzma -o ~/workdir/artifacts/codacy-coverage-reporter-linux ~/workdir/tmp-artifacts/codacy-coverage-reporter-linux
           # upx binaries don't work on Mac OS Big Sur https://github.com/upx/upx/issues/424
           # use upx again once the bug is fixed
-          # upx --lzma -o ~/workdir/artifacts/codacy-coverage-reporter-darwin ~/workdir/tmp-artifacts/codacy-coverage-reporter-darwin
-          cp ~/workdir/tmp-artifacts/codacy-coverage-reporter-darwin ~/workdir/artifacts/codacy-coverage-reporter-darwin
+          upx --lzma -o ~/workdir/artifacts/codacy-coverage-reporter-darwin ~/workdir/tmp-artifacts/codacy-coverage-reporter-darwin
+          #cp ~/workdir/tmp-artifacts/codacy-coverage-reporter-darwin ~/workdir/artifacts/codacy-coverage-reporter-darwin
       - persist_to_workspace:
           root: ~/workdir
           paths:
             - artifacts/*
 
   it_coverage_script_alpine:
     docker:
-      - image: alpine:3.9.5
+      - image: alpine:3.18
       - image: mockserver/mockserver
     working_directory: ~/workdir
     steps:
@@ -121,8 +117,8 @@ jobs:
           command: |
             apk --no-cache add openssl wget
             wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
-            wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.31-r0/glibc-2.31-r0.apk
-            apk add glibc-2.31-r0.apk
+            wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r1/glibc-2.35-r1.apk
+            apk add glibc-2.35-r1.apk
       - attach_workspace:
           at: ~/workdir
       - run:
@@ -137,7 +133,7 @@ jobs:
 
   it_coverage_script_ubuntu:
     docker:
-      - image: cimg/base:2020.01 # ubuntu based image
+      - image: cimg/base:2023.10 # ubuntu based image
       - image: mockserver/mockserver
     working_directory: ~/workdir
     parameters:
@@ -187,13 +183,12 @@ jobs:
             export CODACY_PROJECT_TOKEN='TEST_CODACY_PROJECT_TOKEN'
             export TEST_CODACY_REPORT_PATH='integration-tests/test_dotcover.xml'
             export CODACY_REPORTER_TMP_FOLDER=".codacy-coverage"
-            sh get.sh report --commit-uuid 'e9bef8a69a439bd601c37c0557277572425203a7'  -r $TEST_CODACY_REPORT_PATH --codacy-api-base-url http://localhost:1080
+            sh get.sh report --commit-uuid 'e9bef8a69a439bd601c37c0557277572425203a7' -r $TEST_CODACY_REPORT_PATH --codacy-api-base-url http://localhost:1080
             export ERROR_CODE=$?
             if [ $ERROR_CODE -ne 0 ]; then echo "expected an error code 0 and got $ERROR_CODE instead"; exit 1; fi
             echo "test completed with the expected error code: 0"
 
 workflows:
-  version: 2
   compile_test_deploy:
     jobs:
       - codacy/wait_for_workflows:

diff --git a/get.sh b/get.sh
@@ -178,7 +178,7 @@ is_self_hosted_instance() {
 os_name=$(uname)
 
 # This version should be one that matches the latest self hosted release.
-SELF_HOSTED_CODACY_REPORTER_VERSION="13.13.0"
+SELF_HOSTED_CODACY_REPORTER_VERSION="13.13.9"
 
 # Find the latest version in case is not specified
 if [ -z "$CODACY_REPORTER_VERSION" ] || [ "$CODACY_REPORTER_VERSION" = "latest" ]; then