Skip to content

Commit 8917553

Browse files
jahidulpabelislamjahidulpabelislam
authored
Merge branch 'mailchimp:main' into main
2 parents 8cd9ddc + de7d9a9 commit 8917553

File tree

4 files changed

+86
-89
lines changed

4 files changed

+86
-89
lines changed

‎.github/workflows/create-release-transactional.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,10 @@ jobs:
336336
mkdir -p swagger-out/transactional-ruby
337337
unzip zip/mailchimp-transactional-ruby.zip -d swagger-out/transactional-ruby
338338
339-
- name: Set up Ruby 2.6
339+
- name: Set up Ruby 2.7
340340
uses: ruby/setup-ruby@v1
341341
with:
342-
ruby-version: '2.6'
342+
ruby-version: '2.7'
343343

344344
- name: Install client dependencies
345345
run: gem install rspec
@@ -370,10 +370,10 @@ jobs:
370370
path: .cache
371371
key: cache-dir
372372

373-
- name: Install Python 3.7
373+
- name: Install Python 3.9
374374
uses: actions/setup-python@v1
375375
with:
376-
python-version: 3.7
376+
python-version: 3.9
377377

378378
- uses: actions/[email protected]
379379
with:
@@ -407,7 +407,7 @@ jobs:
407407
- name: Create Release
408408
uses: actions/create-release@latest
409409
env:
410-
GITHUB_TOKEN: ${{ secrets.GIT_CODEGEN_TOKEN }} #use fresh token
410+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # token automatically provided
411411
SPEC_VERSION: ${{ needs.validate.outputs.version }}
412412
with:
413413
tag_name: ${{ github.ref }}

‎.github/workflows/test-transactional.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Prepare Build & Publishing Tools
2222
run: npm install
2323

24-
- uses: dawidd6/action-download-artifact@b9571484721e8187f1fd08147b497129f8972c74
24+
- uses: dawidd6/action-download-artifact@v11
2525
with:
2626
workflow: ${{ github.event.workflow_run.workflow_id }}
2727
run_id: ${{ github.event.workflow_run.id }}
@@ -50,13 +50,13 @@ jobs:
5050
- uses: actions/checkout@v2
5151
- name: Initialize Transactional Cache
5252
id: init-cache-mc
53-
uses: actions/cache@v1
53+
uses: actions/cache@v4
5454
with:
5555
path: .cache
5656
key: cache-dir
5757

5858

59-
- uses: dawidd6/action-download-artifact@b9571484721e8187f1fd08147b497129f8972c74
59+
- uses: dawidd6/action-download-artifact@v11
6060
with:
6161
workflow: ${{ github.event.workflow_run.workflow_id }}
6262
run_id: ${{ github.event.workflow_run.id }}
@@ -95,12 +95,12 @@ jobs:
9595
- uses: actions/checkout@v2
9696
- name: Initialize Transactional Cache
9797
id: init-cache-mc
98-
uses: actions/cache@v1
98+
uses: actions/cache@v4
9999
with:
100100
path: .cache
101101
key: cache-dir
102102

103-
- uses: dawidd6/action-download-artifact@b9571484721e8187f1fd08147b497129f8972c74
103+
- uses: dawidd6/action-download-artifact@v11
104104
with:
105105
workflow: ${{ github.event.workflow_run.workflow_id }}
106106
run_id: ${{ github.event.workflow_run.id }}
@@ -142,18 +142,17 @@ jobs:
142142
- uses: actions/checkout@v2
143143
- name: Initialize Transactional Cache
144144
id: init-cache-mc
145-
uses: actions/cache@v1
145+
uses: actions/cache@v4
146146
with:
147147
path: .cache
148148
key: cache-dir
149149

150-
- name: Install Python 3.7
150+
- name: Install Python 3.9
151151
uses: actions/setup-python@v1
152152
with:
153-
python-version: 3.7
153+
python-version: 3.9
154154

155-
156-
- uses: dawidd6/action-download-artifact@b9571484721e8187f1fd08147b497129f8972c74
155+
- uses: dawidd6/action-download-artifact@v11
157156
with:
158157
workflow: ${{ github.event.workflow_run.workflow_id }}
159158
run_id: ${{ github.event.workflow_run.id }}

‎.github/workflows/validate-and-generate-transactional.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: Cache node_modules
17-
uses: actions/cache@v1
17+
uses: actions/cache@v4
1818
env:
1919
cache-name: cache-node-modules
2020
with:
@@ -40,7 +40,7 @@ jobs:
4040
- uses: actions/checkout@v2
4141
- name: Initialize Cache
4242
id: init-cache-md
43-
uses: actions/cache@v1
43+
uses: actions/cache@v4
4444
with:
4545
path: .cache
4646
key: cache-dir
@@ -60,13 +60,13 @@ jobs:
6060

6161
- name: Initialize Transactional Cache
6262
id: init-cache-md
63-
uses: actions/cache@v1
63+
uses: actions/cache@v4
6464
with:
6565
path: .cache
6666
key: cache-dir
6767

6868
- name: Cache node_modules
69-
uses: actions/cache@v1
69+
uses: actions/cache@v4
7070
env:
7171
cache-name: cache-node-modules
7272
with:
@@ -115,13 +115,13 @@ jobs:
115115
- uses: actions/checkout@v2
116116
- name: Initialize Transactional Cache
117117
id: init-cache-md
118-
uses: actions/cache@v1
118+
uses: actions/cache@v4
119119
with:
120120
path: .cache
121121
key: cache-dir
122122

123123
- name: Cache node_modules
124-
uses: actions/cache@v1
124+
uses: actions/cache@v4
125125
env:
126126
cache-name: cache-node-modules
127127
with:
@@ -159,13 +159,13 @@ jobs:
159159

160160
- name: Initialize Transactional Cache
161161
id: init-cache-md
162-
uses: actions/cache@v1
162+
uses: actions/cache@v4
163163
with:
164164
path: .cache
165165
key: cache-dir
166166

167167
- name: Cache node_modules
168-
uses: actions/cache@v1
168+
uses: actions/cache@v4
169169
env:
170170
cache-name: cache-node-modules
171171
with:
@@ -203,13 +203,13 @@ jobs:
203203

204204
- name: Initialize Transactional Cache
205205
id: init-cache-md
206-
uses: actions/cache@v1
206+
uses: actions/cache@v4
207207
with:
208208
path: .cache
209209
key: cache-dir
210210

211211
- name: Cache node_modules
212-
uses: actions/cache@v1
212+
uses: actions/cache@v4
213213
env:
214214
cache-name: cache-node-modules
215215
with:

‎spec/transactional.json‎

Lines changed: 62 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
},
179179
"swagger": "2.0",
180180
"info": {
181-
"version": "1.1.0",
181+
"version": "1.1.2",
182182
"title": "Mailchimp Transactional API",
183183
"contact": {
184184
"name": "API Support",
@@ -4613,69 +4613,67 @@
46134613
"200": {
46144614
"description": "",
46154615
"schema": {
4616-
"schema": {
4617-
"type": "array",
4618-
"description": "an array of objects for each recipient containing the key \"email\" with the email address, and details of the message status for that recipient",
4619-
"items": {
4620-
"type": "object",
4621-
"description": "the sending results for a single recipient",
4622-
"properties": {
4623-
"email": {
4624-
"type": "string",
4625-
"format": "email",
4626-
"description": "the email address of the recipient",
4627-
"example": "[email protected]"
4628-
},
4629-
"status": {
4630-
"type": "string",
4631-
"description": "the sending status of the recipient",
4632-
"enum": [
4633-
"sent",
4634-
"queued",
4635-
"scheduled",
4636-
"rejected",
4637-
"invalid"
4638-
],
4639-
"example": "sent"
4640-
},
4641-
"reject_reason": {
4642-
"type": "string",
4643-
"description": "the reason for the rejection if the recipient status is \"rejected\"",
4644-
"enum": [
4645-
"hard-bounce",
4646-
"soft-bounce",
4647-
"spam",
4648-
"unsub",
4649-
"custom",
4650-
"invalid-sender",
4651-
"invalid",
4652-
"test-mode-limit",
4653-
"unsigned",
4654-
"rule"
4655-
],
4656-
"example": "hard-bounce"
4657-
},
4658-
"queued_reason": {
4659-
"type": "string",
4660-
"description": "the reason for the email being queued if the response status is \"queued\"",
4661-
"enum": [
4662-
"attachments",
4663-
"multiple-recipients",
4664-
"free-trial-sends-exhausted",
4665-
"hourly-quota-exhausted",
4666-
"monthly-limit-reached",
4667-
"sending-paused",
4668-
"sending-suspended",
4669-
"account-suspended",
4670-
"sending-backlogged"
4671-
],
4672-
"example": "hourly-quota-exhausted"
4673-
},
4674-
"_id": {
4675-
"type": "string",
4676-
"description": "the message's unique id",
4677-
"example": "a92c74e4c5d74998ba690cd535483bb7"
4678-
}
4616+
"type": "array",
4617+
"description": "an array of objects for each recipient containing the key \"email\" with the email address, and details of the message status for that recipient",
4618+
"items": {
4619+
"type": "object",
4620+
"description": "the sending results for a single recipient",
4621+
"properties": {
4622+
"email": {
4623+
"type": "string",
4624+
"format": "email",
4625+
"description": "the email address of the recipient",
4626+
"example": "[email protected]"
4627+
},
4628+
"status": {
4629+
"type": "string",
4630+
"description": "the sending status of the recipient",
4631+
"enum": [
4632+
"sent",
4633+
"queued",
4634+
"scheduled",
4635+
"rejected",
4636+
"invalid"
4637+
],
4638+
"example": "sent"
4639+
},
4640+
"reject_reason": {
4641+
"type": "string",
4642+
"description": "the reason for the rejection if the recipient status is \"rejected\"",
4643+
"enum": [
4644+
"hard-bounce",
4645+
"soft-bounce",
4646+
"spam",
4647+
"unsub",
4648+
"custom",
4649+
"invalid-sender",
4650+
"invalid",
4651+
"test-mode-limit",
4652+
"unsigned",
4653+
"rule"
4654+
],
4655+
"example": "hard-bounce"
4656+
},
4657+
"queued_reason": {
4658+
"type": "string",
4659+
"description": "the reason for the email being queued if the response status is \"queued\"",
4660+
"enum": [
4661+
"attachments",
4662+
"multiple-recipients",
4663+
"free-trial-sends-exhausted",
4664+
"hourly-quota-exhausted",
4665+
"monthly-limit-reached",
4666+
"sending-paused",
4667+
"sending-suspended",
4668+
"account-suspended",
4669+
"sending-backlogged"
4670+
],
4671+
"example": "hourly-quota-exhausted"
4672+
},
4673+
"_id": {
4674+
"type": "string",
4675+
"description": "the message's unique id",
4676+
"example": "a92c74e4c5d74998ba690cd535483bb7"
46794677
}
46804678
}
46814679
}

0 commit comments

Comments
 (0)