Skip to content

Commit

Permalink
[h2 deploy] Check for uncommited changes, output JSON in CI (#1496)
Browse files Browse the repository at this point in the history
* Check for uncommited changes, write JSON output in CI

* fix typecheck issues, allow bun as cli command

* PR feedback

* simplify test, remove changelog
  • Loading branch information
vincentezw authored Nov 17, 2023
1 parent 23e4aaa commit 9ed789d
Show file tree
Hide file tree
Showing 19 changed files with 322 additions and 79 deletions.
13 changes: 13 additions & 0 deletions .changeset/happy-eagles-attack.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
'skeleton': patch
---

Updated internal dependencies for bug resolution.
Please update the `@shopify/cli` dependency in your app to avoid duplicated subdependencies:

```diff
"dependencies": {
- "@shopify/cli": "3.50.2",
+ "@shopify/cli": "3.51.0",
}
```
2 changes: 1 addition & 1 deletion examples/customer-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@remix-run/react": "2.1.0",
"@remix-run/server-runtime": "2.1.0",
"@shopify/cli": "3.50.2",
"@shopify/cli": "3.51.0",
"@shopify/cli-hydrogen": "^6.0.0",
"@shopify/hydrogen": "^2023.10.0",
"@shopify/remix-oxygen": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"devDependencies": {
"@remix-run/dev": "2.1.0",
"@remix-run/eslint-config": "2.1.0",
"@shopify/cli": "3.50.2",
"@shopify/cli": "3.51.0",
"@shopify/cli-hydrogen": "^6.0.2",
"@types/compression": "^1.7.2",
"@types/express": "^4.17.17",
Expand Down
108 changes: 54 additions & 54 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions packages/cli/oclif.manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,14 @@
"required": false,
"multiple": false
},
"force": {
"name": "force",
"type": "boolean",
"char": "f",
"description": "Forces a deployment to proceed if there are uncommited changes in its Git repository.",
"required": false,
"allowNo": false
},
"path": {
"name": "path",
"type": "option",
Expand All @@ -191,6 +199,13 @@
"required": false,
"allowNo": false
},
"no-json-output": {
"name": "no-json-output",
"type": "boolean",
"description": "Prevents the command from creating a JSON file containing the deployment URL (in CI environments).",
"required": false,
"allowNo": false
},
"token": {
"name": "token",
"type": "option",
Expand All @@ -199,6 +214,13 @@
"required": false,
"multiple": false
},
"metadata-description": {
"name": "metadata-description",
"type": "option",
"description": "Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommited changes.",
"required": false,
"multiple": false
},
"metadata-url": {
"name": "metadata-url",
"type": "option",
Expand Down
Loading

0 comments on commit 9ed789d

Please sign in to comment.