Skip to content

Commit 418eb97

Browse files
authored
Merge branch 'master' into al2-uploads-need-different-shas
2 parents 22d8ab9 + 4bc8b72 commit 418eb97

File tree

6 files changed

+26
-7
lines changed

6 files changed

+26
-7
lines changed

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
99

10+
## [2.24.0](https://github.com/netlify/open-api/compare/v2.23.2...v2.24.0) (2023-10-27)
11+
12+
13+
### Features
14+
15+
* Added framework_version to DeplotFiles ([d756a5c](https://github.com/netlify/open-api/commit/d756a5cdc75882bb88afce3ef0167ab707f5b2cc))
16+
17+
18+
### Bug Fixes
19+
20+
* Add FrameworkVersion to DeployOptions ([1a86b73](https://github.com/netlify/open-api/commit/1a86b735005ded85b536bfe414c9c04f7a34ec24))
21+
1022
## [2.23.2](https://github.com/netlify/open-api/compare/v2.23.1...v2.23.2) (2023-10-19)
1123

1224

go/models/deploy_files.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go/porcelain/deploy.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ type DeployOptions struct {
9191
Branch string
9292
CommitRef string
9393
Framework string
94+
FrameworkVersion string
9495
UploadTimeout time.Duration
9596
PreProcessTimeout time.Duration
9697

@@ -262,10 +263,11 @@ func (n *Netlify) DoDeploy(ctx context.Context, options *DeployOptions, deploy *
262263
options.functionsConfig = functionsConfig
263264

264265
deployFiles := &models.DeployFiles{
265-
Files: options.files.Sums,
266-
Draft: options.IsDraft,
267-
Async: n.overCommitted(options.files),
268-
Framework: options.Framework,
266+
Files: options.files.Sums,
267+
Draft: options.IsDraft,
268+
Async: n.overCommitted(options.files),
269+
Framework: options.Framework,
270+
FrameworkVersion: options.FrameworkVersion,
269271
}
270272
if options.functions != nil {
271273
deployFiles.Functions = options.functions.Sums

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@netlify/open-api",
33
"description": "Netlify's open-api definition as a module",
4-
"version": "2.23.2",
4+
"version": "2.24.0",
55
"author": "Netlify",
66
"ava": {
77
"files": [

swagger.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
swagger: '2.0'
22
info:
3-
version: 2.23.2
3+
version: 2.24.0
44
title: Netlify's API documentation
55
description: >-
66
Netlify is a hosting service for the programmable web. It understands your
@@ -3036,6 +3036,8 @@ definitions:
30363036
type: string
30373037
framework:
30383038
type: string
3039+
framework_version:
3040+
type: string
30393041
pluginParams:
30403042
type: object
30413043
properties:

0 commit comments

Comments
 (0)