Skip to content

Commit f013bb9

Browse files
mc-keithmc-keith
authored
Merge pull request #371 from earthiverse/main
Fix dual attributes & some CI
2 parents bc56dad + 18b3def commit f013bb9

File tree

7 files changed

+36
-38
lines changed

7 files changed

+36
-38
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ jobs:
8282
${{ runner.os }}-build-
8383
${{ runner.os }}-
8484
85-
- uses: actions/setup-node@v1
85+
- uses: actions/setup-node@v4
8686
with:
87-
node-version: '12.x'
87+
node-version: '22.x'
8888
registry-url: 'https://registry.npmjs.org'
8989
scope: '@mailchimp'
9090

@@ -106,7 +106,7 @@ jobs:
106106
run: zip -r mailchimp-marketing-node.zip .
107107

108108
- name: Upload build artifact → marketing-node
109-
uses: actions/upload-artifact@v1
109+
uses: actions/upload-artifact@v4
110110
with:
111111
name: mailchimp-marketing-node.zip
112112
path: swagger-out/marketing-node/mailchimp-marketing-node.zip
@@ -149,7 +149,7 @@ jobs:
149149
run: zip -r mailchimp-marketing-php.zip .
150150

151151
- name: Upload build artifact → marketing-php
152-
uses: actions/upload-artifact@v1
152+
uses: actions/upload-artifact@v4
153153
with:
154154
name: mailchimp-marketing-php.zip
155155
path: swagger-out/marketing-php/mailchimp-marketing-php.zip
@@ -192,7 +192,7 @@ jobs:
192192
run: zip -r mailchimp-marketing-ruby.zip .
193193

194194
- name: Upload build artifact → marketing-ruby
195-
uses: actions/upload-artifact@v1
195+
uses: actions/upload-artifact@v4
196196
with:
197197
name: mailchimp-marketing-ruby.zip
198198
path: swagger-out/marketing-ruby/mailchimp-marketing-ruby.zip
@@ -235,7 +235,7 @@ jobs:
235235
run: zip -r mailchimp-marketing-python.zip .
236236

237237
- name: Upload build artifact → marketing-python
238-
uses: actions/upload-artifact@v1
238+
uses: actions/upload-artifact@v4
239239
with:
240240
name: mailchimp-marketing-python.zip
241241
path: swagger-out/marketing-python/mailchimp-marketing-python.zip
@@ -245,9 +245,9 @@ jobs:
245245
needs: [generate-node]
246246
steps:
247247
- uses: actions/checkout@v2
248-
- uses: actions/setup-node@v1
248+
- uses: actions/setup-node@v4
249249
with:
250-
node-version: '12.x'
250+
node-version: '22.x'
251251
registry-url: 'https://registry.npmjs.org'
252252
scope: '@mailchimp'
253253

@@ -434,9 +434,9 @@ jobs:
434434
needs: [validate, create-release]
435435
steps:
436436
- uses: actions/checkout@v2
437-
- uses: actions/setup-node@v1
437+
- uses: actions/setup-node@v4
438438
with:
439-
node-version: '12.x'
439+
node-version: '22.x'
440440
registry-url: 'https://registry.npmjs.org'
441441
scope: '@mailchimp'
442442

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ jobs:
8282
${{ runner.os }}-build-
8383
${{ runner.os }}-
8484
85-
- uses: actions/setup-node@v1
85+
- uses: actions/setup-node@v4
8686
with:
87-
node-version: '12.x'
87+
node-version: '22.x'
8888
registry-url: 'https://registry.npmjs.org'
8989
scope: '@mailchimp'
9090

@@ -106,7 +106,7 @@ jobs:
106106
run: zip -r mailchimp-transactional-node.zip .
107107

108108
- name: Upload build artifact → transactional-node
109-
uses: actions/upload-artifact@v1
109+
uses: actions/upload-artifact@v4
110110
with:
111111
name: mailchimp-transactional-node.zip
112112
path: swagger-out/transactional-node/mailchimp-transactional-node.zip
@@ -149,7 +149,7 @@ jobs:
149149
run: zip -r mailchimp-transactional-php.zip .
150150

151151
- name: Upload build artifact → transactional-php
152-
uses: actions/upload-artifact@v1
152+
uses: actions/upload-artifact@v4
153153
with:
154154
name: mailchimp-transactional-php.zip
155155
path: swagger-out/transactional-php/mailchimp-transactional-php.zip
@@ -192,7 +192,7 @@ jobs:
192192
run: zip -r mailchimp-transactional-ruby.zip .
193193

194194
- name: Upload build artifact → transactional-ruby
195-
uses: actions/upload-artifact@v1
195+
uses: actions/upload-artifact@v4
196196
with:
197197
name: mailchimp-transactional-ruby.zip
198198
path: swagger-out/transactional-ruby/mailchimp-transactional-ruby.zip
@@ -235,7 +235,7 @@ jobs:
235235
run: zip -r mailchimp-transactional-python.zip .
236236

237237
- name: Upload build artifact → transactional-python
238-
uses: actions/upload-artifact@v1
238+
uses: actions/upload-artifact@v4
239239
with:
240240
name: mailchimp-transactional-python.zip
241241
path: swagger-out/transactional-python/mailchimp-transactional-python.zip
@@ -245,9 +245,9 @@ jobs:
245245
needs: [generate-node]
246246
steps:
247247
- uses: actions/checkout@v4
248-
- uses: actions/setup-node@v1
248+
- uses: actions/setup-node@v4
249249
with:
250-
node-version: '12.x'
250+
node-version: '22.x'
251251
registry-url: 'https://registry.npmjs.org'
252252
scope: '@mailchimp'
253253

@@ -420,9 +420,9 @@ jobs:
420420
needs: [validate, create-release]
421421
steps:
422422
- uses: actions/checkout@v4
423-
- uses: actions/setup-node@v1
423+
- uses: actions/setup-node@v4
424424
with:
425-
node-version: '12.x'
425+
node-version: '22.x'
426426
registry-url: 'https://registry.npmjs.org'
427427
scope: '@mailchimp'
428428

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
steps:
1313
- uses: haya14busa/action-workflow_run-status@967ed83efa565c257675ed70cfe5231f062ddd94
1414
- uses: actions/checkout@v2
15-
- uses: actions/setup-node@v1
15+
- uses: actions/setup-node@v4
1616
with:
17-
node-version: '12.x'
17+
node-version: '22.x'
1818
registry-url: 'https://registry.npmjs.org'
1919
scope: '@mailchimp'
2020

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
steps:
1313
- uses: haya14busa/action-workflow_run-status@967ed83efa565c257675ed70cfe5231f062ddd94
1414
- uses: actions/checkout@v2
15-
- uses: actions/setup-node@v1
15+
- uses: actions/setup-node@v4
1616
with:
17-
node-version: '12.x'
17+
node-version: '22.x'
1818
registry-url: 'https://registry.npmjs.org'
1919
scope: '@mailchimp'
2020

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ jobs:
7676
${{ runner.os }}-build-
7777
${{ runner.os }}-
7878
79-
- uses: actions/setup-node@v1
79+
- uses: actions/setup-node@v4
8080
with:
81-
node-version: '12.x'
81+
node-version: '22.x'
8282
registry-url: 'https://registry.npmjs.org'
8383
scope: '@mailchimp'
8484

@@ -100,7 +100,7 @@ jobs:
100100
run: zip -r mailchimp-marketing-node.zip .
101101

102102
- name: Upload build artifact → marketing-node
103-
uses: actions/upload-artifact@v1
103+
uses: actions/upload-artifact@v4
104104
with:
105105
name: mailchimp-marketing-node.zip
106106
path: swagger-out/marketing-node/mailchimp-marketing-node.zip
@@ -144,7 +144,7 @@ jobs:
144144
run: zip -r mailchimp-marketing-php.zip .
145145

146146
- name: Upload build artifact → marketing-php
147-
uses: actions/upload-artifact@v1
147+
uses: actions/upload-artifact@v4
148148
with:
149149
name: mailchimp-marketing-php.zip
150150
path: swagger-out/marketing-php/mailchimp-marketing-php.zip
@@ -188,7 +188,7 @@ jobs:
188188
run: zip -r mailchimp-marketing-ruby.zip .
189189

190190
- name: Upload build artifact → marketing-ruby
191-
uses: actions/upload-artifact@v1
191+
uses: actions/upload-artifact@v4
192192
with:
193193
name: mailchimp-marketing-ruby.zip
194194
path: swagger-out/marketing-ruby/mailchimp-marketing-ruby.zip
@@ -232,7 +232,7 @@ jobs:
232232
run: zip -r mailchimp-marketing-python.zip .
233233

234234
- name: Upload build artifact → marketing-python
235-
uses: actions/upload-artifact@v1
235+
uses: actions/upload-artifact@v4
236236
with:
237237
name: mailchimp-marketing-python.zip
238238
path: swagger-out/marketing-python/mailchimp-marketing-python.zip

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ jobs:
7777
${{ runner.os }}-build-
7878
${{ runner.os }}-
7979
80-
- uses: actions/setup-node@v1
80+
- uses: actions/setup-node@v4
8181
with:
82-
node-version: '12.x'
82+
node-version: '22.x'
8383
registry-url: 'https://registry.npmjs.org'
8484
scope: '@mailchimp'
8585

@@ -101,7 +101,7 @@ jobs:
101101
run: zip -r mailchimp-transactional-node.zip .
102102

103103
- name: Upload build artifact → transactional-node
104-
uses: actions/upload-artifact@v1
104+
uses: actions/upload-artifact@v4
105105
with:
106106
name: mailchimp-transactional-node.zip
107107
path: swagger-out/transactional-node/mailchimp-transactional-node.zip
@@ -145,7 +145,7 @@ jobs:
145145
run: zip -r mailchimp-transactional-php.zip .
146146

147147
- name: Upload build artifact → transactional-php
148-
uses: actions/upload-artifact@v1
148+
uses: actions/upload-artifact@v4
149149
with:
150150
name: mailchimp-transactional-php.zip
151151
path: swagger-out/transactional-php/mailchimp-transactional-php.zip
@@ -189,7 +189,7 @@ jobs:
189189
run: zip -r mailchimp-transactional-ruby.zip .
190190

191191
- name: Upload build artifact → transactional-ruby
192-
uses: actions/upload-artifact@v1
192+
uses: actions/upload-artifact@v4
193193
with:
194194
name: mailchimp-transactional-ruby.zip
195195
path: swagger-out/transactional-ruby/mailchimp-transactional-ruby.zip
@@ -233,7 +233,7 @@ jobs:
233233
run: zip -r mailchimp-transactional-python.zip .
234234

235235
- name: Upload build artifact → transactional-python
236-
uses: actions/upload-artifact@v1
236+
uses: actions/upload-artifact@v4
237237
with:
238238
name: mailchimp-transactional-python.zip
239239
path: swagger-out/transactional-python/mailchimp-transactional-python.zip

‎swagger-config/marketing/php/templates/Configuration.mustache‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class Configuration
2626
protected $debugFile = 'php://output';
2727
protected $tempFolderPath;
2828
protected $timeout = 120;
29-
{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}{{#-first}}public ${{#tags}}{{{name}}}{{/tags}};
30-
{{/-first}}{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
3129
3230
{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}{{#-first}}public ${{#tags}}{{{name}}}{{/tags}};
3331
{{/-first}}{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}

0 commit comments

Comments
 (0)