Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump github/branch-deploy to v10 and update branch-deploy settings #1025

Merged
merged 2 commits into from
Dec 16, 2024
Merged

bump github/branch-deploy to v10 and update branch-deploy settings #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8694ef6
bump github/branch-deploy to `v10` and update branch-deploy settings
GrantBirki Dec 16, 2024
39cd1ad
Merge branch 'main' into branch-deploy-v10
GrantBirki Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/branch-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,18 @@ jobs:

steps:

- uses: github/branch-deploy@v10.0.0-rc.1
- uses: github/branch-deploy@v10
id: branch-deploy
with:
admins: the-hideout/core-contributors
admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
skip_ci: development
skip_reviews: development
environment_targets: production,development
environment_urls: production|https://tarkov.dev,development|disabled
sticky_locks: "true"

- name: checkout
if: ${{ steps.branch-deploy.outputs.continue == 'true' }}
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4
with:
ref: ${{ steps.branch-deploy.outputs.sha }}

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ jobs:

steps:
- name: deployment check
uses: github/branch-deploy@v10.0.0-rc.1
uses: github/branch-deploy@v10
id: deployment-check
with:
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
environment: production

- name: checkout
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4
with:
ref: ${{ steps.deployment-check.outputs.sha }}

# check to ensure all JSON files are valid in the repository
- name: json-yaml-validate
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unlock-on-merge.yml
View file
Open in desktop
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@v10.0.0-rc.1
uses: github/branch-deploy@v10
id: unlock-on-merge
with:
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow
Expand Down
Loading