fastlane-plugin-yalantis_ci 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58cd3b0ec5fef22e15fa882c7ca44203708e8856c0564f576fe7663abfc831b1
-  data.tar.gz: c3a33707d3a0bebdfba4226401c9152e46eb8176c9884a588d058554447d0ecf
+  metadata.gz: 4622dd6d9a13b4d67310b8cd8421bc00abcba72ddaa43ccc0765527f3d647699
+  data.tar.gz: 989f4db2393f9a5cd2401522b69a04f439d6f07f75fea35b29554887dff25b31
 SHA512:
-  metadata.gz: 90b56e0a44ac82f76ec2c06c66b64c11d5f6f7b479c8fbbde46613731ed684337275c9ceaa100df5c7afdac7f4af5a0aada08000cdc1eeb407e6e4dc7c95ed81
-  data.tar.gz: 34b52c767b66eb3d92b1616a005b95ee47e56962067e830148248afe06d5a4aaf1e20ecf4e388d5c090547f5b78a484e8a9151c5a1020f71c357b1c2deef0af9
+  metadata.gz: 2b0155b2f1ec999d5a2de687a0d9ad705865fe1333ece391dfd09d82fb78d3a21c7cb3b333c6f70911e523e7dc67ba721768d209ae05a50acbfa611d02b2e89f
+  data.tar.gz: cd2d555a42cfa1333b2ace48234e598cf4c705853a7550481df2b72e9515320140f586a801b7d508f4e448cc359882ac2e2042a158733de7cff01b102f18d78d

data/lib/fastlane/plugin/yalantis_ci/actions/ci_setup.rb

@@ -17,15 +17,15 @@ module Fastlane
         Actions.lane_context[SharedValues::CI_UNIQUE_PROJECT_ID] = id
         ENV['CI_UNIQUE_PROJECT_ID'] = id
 
-        # We want to setup match repo regardless of the environment. 
+        # We want to setup match repo regardless of the environment
         # On both local and remote machine this should be set to the same value
         self.setup_match_repo(id)
 
-        if !Helper.ci?
+        unless Helper.ci?
           return
         end
 
-        self.setup_temp_keychain(id)
+        self.setup_temp_keychain(params[:keychain_name] || id)
 
         # Set output directory
         if params[:output_directory]
@@ -39,9 +39,9 @@ module Fastlane
           if params[:archive_name]
             extension = "xcarchive"
             archive_name = File.basename(params[:archive_name], File.extname(params[:archive_name])) + extension
-            archive_path = File.join(output_directory_path, params[:archive_name])
+            archive_path = File.join(output_directory_path, archive_name)
 
-            UI.message("Setting archive path to: \"#{output_directory_path}\".")
+            UI.message("Setting archive path to: \"#{output_directory_path}\"")
             ENV['GYM_ARCHIVE_PATH'] = archive_path
           end
         end
@@ -80,9 +80,7 @@ module Fastlane
       end
 
       def self.setup_temp_keychain(id)
-        job_id = ENV['CI_JOBENV_ID'] || ''
-
-        name = "#{id}-#{job_id}-fastlane"
+        name = "#{id}-fastlane"
         password = "#{name}-password"
         path = File.expand_path("~/Library/Keychains/#{name}.keychain-db")
 
@@ -118,35 +116,44 @@ module Fastlane
       end
 
       def self.available_options
-        # Define all options your action supports. 
-        
+        # Define all options your action supports
         # Below a few examples
         [
-          FastlaneCore::ConfigItem.new(key: :derived_data_path,
-                                       env_name: "CI_DERIVED_DATA_PATH",
-                                       description: "Path to the derived data to be used",
-                                       is_string: true,
-                                       default_value: "./build/DerivedData"
-                                       ),
-          FastlaneCore::ConfigItem.new(key: :output_directory,
-                                       env_name: "CI_OUTPUT_DIRECTORY",
-                                       description: "The directory in which the ipa file should be stored in as well as .xcarchive",
-                                       is_string: true,
-                                       default_value: "./build"
-                                       ),
-          FastlaneCore::ConfigItem.new(key: :archive_name,
-                                       env_name: "CI_ARCHIVE_NAME",
-                                       description: "The name of the .xcarchive to be used. Valid only when :output_directory is passed",
-                                       is_string: true,
-                                       optional: true
-                                       ),
-          FastlaneCore::ConfigItem.new(key: :project,
-                                       env_name: "XC_PROJECT",
-                                       description: "Path to the .xcodeproj to be used or any project-related description. Used during CI_UNIQUE_PROJECT_ID generation",
-                                       is_string: true,
-                                       optional: false
-                                       ),
-
+          FastlaneCore::ConfigItem.new(
+            key: :derived_data_path,
+            env_name: "CI_DERIVED_DATA_PATH",
+            description: "Path to the derived data to be used",
+            is_string: true,
+            default_value: "./build/DerivedData"
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :keychain_name,
+            env_name: "CI_KEYCHAIN_NAME",
+            description: "Keychain name to be used for a particular job",
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :output_directory,
+            env_name: "CI_OUTPUT_DIRECTORY",
+            description: "The directory in which the ipa file should be stored in as well as .xcarchive",
+            is_string: true,
+            default_value: "./build"
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :archive_name,
+            env_name: "CI_ARCHIVE_NAME",
+            description: "The name of the .xcarchive to be used. Valid only when :output_directory is passed",
+            is_string: true,
+            optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :project,
+            env_name: "XC_PROJECT",
+            description: "Path to the .xcodeproj to be used or any project-related description. Used during CI_UNIQUE_PROJECT_ID generation",
+            is_string: true,
+            optional: false
+          ),
         ]
       end
 

data/lib/fastlane/plugin/yalantis_ci/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module YalantisCi
-    VERSION = "0.3.8"
+    VERSION = "0.3.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-yalantis_ci
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Dima Vorona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane-plugin-firebase_app_distribution