-
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #276 from the-hideout/combined-prs-branch
Combined PRs
- Loading branch information
Showing
6 changed files
with
74 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,7 +21,7 @@ jobs: | |
steps: | ||
- name: branch-deploy | ||
id: branch-deploy | ||
uses: github/[email protected].0 | ||
uses: github/[email protected].1 | ||
with: | ||
admins: the-hideout/core-contributors | ||
admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ jobs: | |
|
||
steps: | ||
- name: deployment check | ||
uses: github/[email protected].0 | ||
uses: github/[email protected].1 | ||
id: deployment-check | ||
with: | ||
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy | ||
|
@@ -51,7 +51,7 @@ jobs: | |
RAILWAY_TOKEN: ${{ secrets.RAILWAY_TOKEN }} | ||
|
||
- name: create sentry release | ||
uses: getsentry/action-release@c1b57ce473178fd036cf1133b163b6324c0064a8 # pin@v1.6.0 | ||
uses: getsentry/action-release@e769183448303de84c5a06aaaddf9da7be26d6c7 # pin@v1.7.0 | ||
env: | ||
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} | ||
SENTRY_ORG: tarkov-dev | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ jobs: | |
|
||
steps: | ||
- name: unlock on merge | ||
uses: github/[email protected].0 | ||
uses: github/[email protected].1 | ||
id: unlock-on-merge | ||
with: | ||
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters