Skip to content

Commit

Permalink
Merge branch 'main' into interactive-maps
Browse files Browse the repository at this point in the history
  • Loading branch information
Shebuka authored Jul 26, 2023
2 parents fad0a6f + 10d199e commit 525c773
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:

- uses: github/branch-deploy@v6.1.0
- uses: github/branch-deploy@v7.0.0
id: branch-deploy
with:
admins: the-hideout/core-contributors
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: deployment check
uses: github/branch-deploy@v6.1.0
uses: github/branch-deploy@v7.0.0
id: deployment-check
with:
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unlock-on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: unlock on merge
uses: github/branch-deploy@v6.1.0
uses: github/branch-deploy@v7.0.0
id: unlock-on-merge
with:
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow
Expand Down

0 comments on commit 525c773

Please sign in to comment.