discharger 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5d308400ba10ddbc06050238e59eee124a0f4231e5c2e0ea0668209a6fe4ed0
-  data.tar.gz: 0a1f74dd75de533eef2636ff266a3beb629b4e0506704eee7ef4f9f665539d31
+  metadata.gz: 8b30651d287520179cdce0626af6f8713eaf33c137fec4fde6d8d9313e2a0f2b
+  data.tar.gz: d0ec11e81f96f715e5482b3fc0d398551b75fced5eaee950eaee3f6f1106b7d1
 SHA512:
-  metadata.gz: 78712d1a6bed9db4cd32313774f9102d11617dcbcd516385542b07aed930dfd8fb23c27760caea30cdc463c2a2e0e1c5b4eaf1bd6747f4e93b2609e15be738e9
-  data.tar.gz: 7175067f314845ef04ed03e3147d4ef8617b84c56417941997d8a7fa9a198c33c9e4abaaf236f63ce16d8cbe06fd2d7485e8cc2c82f18bae1386e2f6398fc69d
+  metadata.gz: 86ff6ac38f47d1c75fdb361b2e6dea8c39714b9d17670dda4c1361219ff65fef6631eece267ca8f0f151efc420d30e4e26a0adf4c84792e0c19b2b09289169cf
+  data.tar.gz: 86c2932d7eb56428b7e4bf22d14941317cc6dd2b8684b76bdebf1d2286480f10a59ef8f156d0bbbe12c8f417e9979ca9ae39179fd68cde1a469a4b1ce5a7ba73

data/lib/discharger/task.rb

@@ -140,7 +140,7 @@ module Discharger
           ["git branch -D #{production_branch} 2>/dev/null || true"],
           ["git fetch origin #{staging_branch}:#{staging_branch} #{production_branch}:#{production_branch}"],
           ["git checkout #{production_branch}"],
-          ["git rebase #{staging_branch}"],
+          ["git reset --hard #{staging_branch}"],
           ["git tag -a v#{current_version} -m 'Release #{current_version}'"],
           ["git push origin #{production_branch}:#{production_branch} v#{current_version}:v#{current_version}"],
           ["git push origin v#{current_version}"]

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jim Gay
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open3
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Tasks for discharging an application for deployment.
 test_files: []