Skip to content

Commit

Permalink
Merge branch 'main' into game-modes
Browse files Browse the repository at this point in the history
  • Loading branch information
Razzmatazzz authored Jul 12, 2024
2 parents 91a5c51 + c5d8f8c commit d365d2c
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 45 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- name: branch-deploy
id: branch-deploy
uses: github/branch-deploy@v9.1.3
uses: github/branch-deploy@v9.3.0
with:
admins: the-hideout/core-contributors
admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
Expand All @@ -30,7 +30,7 @@ jobs:

- name: checkout
if: steps.branch-deploy.outputs.continue == 'true'
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
ref: ${{ steps.branch-deploy.outputs.ref }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: checkout
uses: actions/[email protected].6
uses: actions/[email protected].7

# validate JSON and YAML files
- name: json-yaml-validate
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: checkout
uses: actions/[email protected].6
uses: actions/[email protected].7

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .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@v9.1.3
uses: github/branch-deploy@v9.3.0
id: deployment-check
with:
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
Expand All @@ -25,7 +25,7 @@ jobs:
# always run checkout because the 'release (sentry)' step needs the code
# do we still need this after removing sentry?
- name: checkout
uses: actions/[email protected].6
uses: actions/[email protected].7

- uses: actions/[email protected]
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/new-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
# Comment on new PR requests with deployment instructions
- name: checkout
uses: actions/[email protected].6
uses: actions/[email protected].7
- name: comment
uses: GrantBirki/comment@1e63d57e8ccc14dd83f5db2af382279aa12a0bbb # [email protected]
continue-on-error: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/restart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: checkout
uses: actions/[email protected].6
uses: actions/[email protected].7

- uses: actions/[email protected]
with:
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@v9.1.3
uses: github/branch-deploy@v9.3.0
id: unlock-on-merge
with:
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow
Expand Down
62 changes: 31 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
"cheerio": "^1.0.0-rc.12",
"cron": "^2.4.0",
"cross-env": "^7.0.3",
"discord-api-types": "^0.37.86",
"discord.js": "^14.15.2",
"discord-api-types": "^0.37.91",
"discord.js": "^14.15.3",
"dotenv": "^16.4.5",
"got": "^13.0.0",
"i18next": "^23.11.5",
"moment": "^2.30.1",
"nodemon": "^3.1.2",
"nodemon": "^3.1.4",
"turndown": "^7.2.0",
"uuid": "^9.0.1"
"uuid": "^10.0.0"
},
"devDependencies": {
"@railway/cli": "^3.5.2"
"@railway/cli": "^3.11.0"
}
}

0 comments on commit d365d2c

Please sign in to comment.