Skip to content

Commit

Permalink
Check for uncommited changes, write JSON output in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentezw committed Nov 15, 2023
1 parent 26c969b commit 0fe25df
Show file tree
Hide file tree
Showing 12 changed files with 433 additions and 270 deletions.
18 changes: 18 additions & 0 deletions .changeset/slimy-sloths-nail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
'@shopify/cli-hydrogen': minor
---

The `deploy` command now displays an error if there are uncommited changes in a project's Git repository. If you'd like to go ahead with the deployment regardless, you can use the new `force` flag.
When deploying with uncommited changes, we use a default description in the form of `<sha> with additional changes` (where `<sha>` represents the hash of the last commit). This description will be visible in the Shopify Admin for the deployment, and the `metadata-description` flag can be used to specify a different description.

In CI environments, the `deploy` command now creates a file "h2_deploy_output.log" file in the current working directory, for successful deployments. This file holds a JSON object with the URL of the deployment. This can be useful for scripting purposes, where consequent steps in your CI workflow require the deployment URL. The flag `--no-json-output` can be used to prevent this behaviour. In the future, we may add further keys to the JSON object.

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",
}
```
5 changes: 5 additions & 0 deletions .changeset/thick-feet-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/cli-hydrogen': patch
---

Resolves an issue with the verification check in the "deploy" command.
3 changes: 1 addition & 2 deletions examples/customer-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"prettier": "@shopify/prettier-config",
"dependencies": {
"@remix-run/react": "2.1.0",
"@remix-run/server-runtime": "2.1.0",
"@shopify/cli": "3.50.0",
"@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.0",
"@shopify/cli": "3.51.0",
"@shopify/cli-hydrogen": "^6.0.2",
"@types/compression": "^1.7.2",
"@types/express": "^4.17.17",
Expand Down
Loading

0 comments on commit 0fe25df

Please sign in to comment.