Skip to content

Commit

Permalink
Automatically merge this branch into the main line branch to ensure i…
Browse files Browse the repository at this point in the history
…t is kept up to date.
  • Loading branch information
wparad committed May 31, 2023
1 parent 984ec3e commit f323ae6
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ jobs:
make tfgen
make provider
# Before we go any further we'll deploy this branch to the mainline, if it works great. If not we'll skip it
git push origin HEAD:main || echo "Skipping merging into main because this branch is not ahead of the mainline branch"
# the schema.json is read by pulumi directly from the repo, so it has to be there, and it can be updated dynamically by everything, so we really don't want it present otherwise
# So we'll generate it during the build and then commit it.
git add provider/cmd/pulumi-resource-authress/schema.json && git commit -m"Committing updated schema.json" || echo "schema.json is up to date."
Expand Down

0 comments on commit f323ae6

Please sign in to comment.