DEV2-3650 - on master (#639)

codota · Sep 9, 2023 · e8c8362 · e8c8362
1 parent b8b7e1b
commit e8c8362
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/production-new-version.yml b/.github/workflows/production-new-version.yml
@@ -12,6 +12,17 @@ on:
         required: true
         default: false
         description: Yes, I want to release.
+      is-production:
+        type: boolean
+        required: true
+        default: true
+        description: "release to production saas"
+
+      is-self-hosted:
+        type: boolean
+        required: true
+        default: true
+        description: "release to self hosted"
 
 jobs:
   confirm:
@@ -75,13 +86,13 @@ jobs:
       - name: Commit changes
         run: |
           NEW_VERSION="${{ steps.get_build_version.outputs.build_version }}"
-          git pull origin master --no-edit
           git commit -am "Set version to $NEW_VERSION"
           git push
           git tag v$NEW_VERSION
           git push origin v$NEW_VERSION
 
   publish-production:
+    if: ${{ github.event.inputs.is-production == 'true' }}
     name: Publish to PRODUCTION
     runs-on: ubuntu-latest
     needs:
@@ -110,9 +121,9 @@ jobs:
       - name: Checkout Chat Application Repository
         uses: dsaltares/fetch-gh-release-asset@master
         with:
-          repo: 'codota/tabnine-chat-app'
-          version: 'tags/${{ env.version }}'
-          file: 'build.tar.gz'
+          repo: "codota/tabnine-chat-app"
+          version: "tags/${{ env.version }}"
+          file: "build.tar.gz"
           token: ${{ secrets.gh_builder_token }}
       - name: Extract Chat App Build
         run: |
@@ -160,6 +171,7 @@ jobs:
           SLACK_FOOTER: " "
 
   publish-self-hosted:
+    if: ${{ github.event.inputs.is-self-hosted == 'true' }}
     name: Publish self hosted
     runs-on: ubuntu-latest
     needs:
@@ -189,9 +201,9 @@ jobs:
       - name: Checkout Chat Application Repository
         uses: dsaltares/fetch-gh-release-asset@master
         with:
-          repo: 'codota/tabnine-chat-app'
-          version: 'tags/${{ env.version }}'
-          file: 'build.tar.gz'
+          repo: "codota/tabnine-chat-app"
+          version: "tags/${{ env.version }}"
+          file: "build.tar.gz"
           token: ${{ secrets.gh_builder_token }}
 
       - name: Extract Chat App Build

diff --git a/TabnineSelfHosted/src/main/java/com/tabnineSelfHosted/loginNotifier.kt b/TabnineSelfHosted/src/main/java/com/tabnineSelfHosted/loginNotifier.kt
@@ -10,7 +10,7 @@ fun showUserLoggedInNotification() {
     val userInfo = ServiceManager.getService(UserInfoService::class.java).fetchAndGet()
     // show notification only if the user is part of a team
     if (userInfo?.team == null) {
-        Logger.getInstance(showUserLoggedInNotification().javaClass)
+        Logger.getInstance(::showUserLoggedInNotification.javaClass)
             .debug("Unable to get user info or no team. Info: ${userInfo ?: "null"}")
         return
     }