discharger 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e7191b459cff13f22f5b7e079a599fb3dedbf91aa8f1c939e64363df6e4c55
-  data.tar.gz: fd53ba816f8684f7a6852c23c35a062d0bd8f8a5c7b9ef36ad56c8cb7b1ba77a
+  metadata.gz: f399dc08de3d54286fe7030a7b7a0e15a2055f9aa62d760073f692f96b0e8b46
+  data.tar.gz: a1f5ce7018dc556f7b18da3fc837cfde7efb589de3c3527e9ad69ba78a78096d
 SHA512:
-  metadata.gz: be138616dc7af6ac3810418dbe0595b68ab5cbf5ff47e1c39c994efc87d555bf724f9ae90ee6fd430dfe30a5ada709d015771b7e939ef4dda24552bb50bc7365
-  data.tar.gz: ab0f5de7b28d24f73c736cc6f4cf3adcbe5fa932835d53594b71102e859b20f0fa2e07f7b56b3b5571c3ded87f52812356509966d86371c2bd0eb70bfdb9767e
+  metadata.gz: b04988a2af1edd4f28ffc2490839df815a4e551456f0d9c4e5a9e23f2ccb774e6e0b6ef313890c85e8fdf5f8bb273934fbaab30cf2088f6b933f272de65abcfb
+  data.tar.gz: 4be4ec992ed4e59d4335c8ad2110d603379ec729c402af8c85db2d7e606f19966a2c3d03aae82d45f7c072a060d76669f18649680270e6e42e83c5f86a289c04

data/lib/discharger/task.rb

@@ -147,7 +147,7 @@ module Discharger
           ["git push origin #{production_branch}:#{production_branch} v#{current_version}:v#{current_version}"],
           ["git push origin v#{current_version}"]
         ) do
-          tasker["#{name}:slack"].invoke("Released #{app_name} #{current_version} to production.", release_message_channel, ":chipmunk:")
+          tasker["#{name}:slack"].invoke("Released #{app_name} #{current_version} (#{commit_identifier.call}) to production.", release_message_channel, ":chipmunk:")
           if last_message_ts.present?
             text = File.read(Rails.root.join(changelog_file))
             tasker["#{name}:slack"].reenable
@@ -206,11 +206,12 @@ module Discharger
           syscall(
             ["git fetch origin #{working_branch}"],
             ["git checkout #{working_branch}"],
+            ["git reset --hard origin/#{working_branch}"],
             ["git branch -D #{staging_branch} 2>/dev/null || true"],
             ["git checkout -b #{staging_branch}"],
             ["git push origin #{staging_branch} --force"]
           ) do
-            tasker["#{name}:slack"].invoke("Building #{app_name} #{commit_identifier.call} on #{staging_branch}.", release_message_channel)
+            tasker["#{name}:slack"].invoke("Building #{app_name} #{current_version} (#{commit_identifier.call}) on #{staging_branch}.", release_message_channel)
             syscall ["git checkout #{working_branch}"]
           end
         end

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Jim Gay
 - Savannah Moore
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open3
@@ -103,7 +102,6 @@ metadata:
   homepage_uri: https://github.com/SOFware/discharger
   source_code_uri: https://github.com/SOFware/discharger.git
   changelog_uri: https://github.com/SOFware/discharger/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Tasks for discharging an application for deployment.
 test_files: []