File tree 7 files changed +66
-3
lines changed
7 files changed +66
-3
lines changed Original file line number Diff line number Diff line change
1
+ include :
2
+ - project : ShipperHQ/DevOps/GitLabTemplates
3
+ ref : INFRA-672
4
+ file : /magento/release.gitlab-ci.yml
5
+
6
+ stages :
7
+ - tag
8
+ - release to GitLab
9
+ - release to GitHub
10
+
11
+ # Denote whether to build major, minor or patch release
12
+ major release :
13
+ stage : tag
14
+ variables :
15
+ VERSION_INCREMENT : " major"
16
+ extends :
17
+ - .m2_module_release
18
+
19
+ minor release :
20
+ stage : tag
21
+ variables :
22
+ VERSION_INCREMENT : " minor"
23
+ extends :
24
+ - .m2_module_release
25
+
26
+ patch release :
27
+ stage : tag
28
+ variables :
29
+ VERSION_INCREMENT : " patch"
30
+ extends :
31
+ - .m2_module_release
32
+
33
+ # Build public release
34
+ build release to GitHub :
35
+ stage : release to GitHub
36
+ variables :
37
+ GITHUB_REPO :
" [email protected] :shipperhq/module-address-autocomplete.git"
38
+ when : on_success
39
+ needs :
40
+ - job : major release
41
+ optional : true
42
+ - job : minor release
43
+ optional : true
44
+ - job : patch release
45
+ optional : true
46
+ extends :
47
+ - .m2_public_release
48
+
Original file line number Diff line number Diff line change @@ -81,3 +81,7 @@ MNB-2364 Resolve issue with Montreal not being populated as city
81
81
SHQ23-326 Fix issue with formatting of US addresses containing an apartment or suite number
82
82
83
83
84
+ ## 20.6.3 (2024-06-03)
85
+ SHQ23-2640 Remove trailing comma from stress address
86
+
87
+
Original file line number Diff line number Diff line change @@ -81,3 +81,7 @@ MNB-2364 Resolve issue with Montreal not being populated as city
81
81
SHQ23-326 Fix issue with formatting of US addresses containing an apartment or suite number
82
82
83
83
84
+ ## 20.6.3 (2024-06-03)
85
+ SHQ23-2640 Remove trailing comma from stress address
86
+
87
+
Original file line number Diff line number Diff line change @@ -23,8 +23,15 @@ Compatibility
23
23
-------------
24
24
This module supports and is tested against the following Magento versions:
25
25
26
+ * 2.4.7-beta1
27
+ * 2.4.6-p1
28
+ * 2.4.6
29
+ * 2.4.5-p3
30
+ * 2.4.5-p2
26
31
* 2.4.5-p1
27
32
* 2.4.5
33
+ * 2.4.4-p4
34
+ * 2.4.4-p3
28
35
* 2.4.4-p2
29
36
* 2.4.4-p1
30
37
* 2.4.4
Original file line number Diff line number Diff line change 2
2
"name" : " shipperhq/module-address-autocomplete" ,
3
3
"description" : " ShipperHQ Address Autocomplete Tool" ,
4
4
"type" : " magento2-module" ,
5
- "version" : " 20.6.2 " ,
5
+ "version" : " 20.6.3 " ,
6
6
"license" : [
7
7
" OSL-3.0" ,
8
8
" AFL-3.0"
Original file line number Diff line number Diff line change 2
2
"name" : " shipperhq/module-address-autocomplete" ,
3
3
"description" : " ShipperHQ Address Autocomplete Tool" ,
4
4
"type" : " magento2-module" ,
5
- "version" : " 20.6.2 " ,
5
+ "version" : " 20.6.3 " ,
6
6
"license" : [
7
7
" OSL-3.0" ,
8
8
" AFL-3.0"
Original file line number Diff line number Diff line change @@ -187,7 +187,7 @@ define(
187
187
var domID = uiRegistry . get ( 'checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.street' ) . elems ( ) [ 0 ] . uid ;
188
188
var streetString = street . join ( ' ' ) ;
189
189
190
- if ( countryId === 'US' ) {
190
+ if ( countryId === 'US' && subpremise !== '' ) {
191
191
streetString += ', ' + subpremise
192
192
}
193
193
You can’t perform that action at this time.
0 commit comments