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.

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

Combined PRs #323

Merged
merged 6 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 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.8.1
uses: github/branch-deploy@v9.9.1
with:
admins: the-hideout/core-contributors
admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
Expand All @@ -30,11 +30,11 @@ jobs:

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

- uses: actions/setup-node@v4.0.4
- uses: actions/setup-node@v4.1.0
if: steps.branch-deploy.outputs.continue == 'true'
with:
node-version-file: .node-version
Expand Down
4 changes: 2 additions & 2 deletions .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].0
uses: actions/[email protected].2

# validate JSON and YAML files
- name: json-yaml-validate
Expand All @@ -26,7 +26,7 @@ jobs:
comment: "true"
exclude_file: ".github/config/exclude.txt"

- uses: actions/setup-node@v4.0.4
- uses: actions/setup-node@v4.1.0
with:
node-version-file: .node-version
cache: 'npm'
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].0
uses: actions/[email protected].2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 3 additions & 3 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.8.1
uses: github/branch-deploy@v9.9.1
id: deployment-check
with:
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
Expand All @@ -25,9 +25,9 @@ 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].0
uses: actions/[email protected].2

- uses: actions/setup-node@v4.0.4
- uses: actions/setup-node@v4.1.0
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
with:
node-version-file: .node-version
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].0
uses: actions/[email protected].2
- name: comment
uses: GrantBirki/comment@f524ee31407667c05061bad41e1758b40298bd82 # [email protected]
continue-on-error: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/restart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:

steps:
- name: checkout
uses: actions/[email protected].0
uses: actions/[email protected].2

- uses: actions/setup-node@v4.0.4
- uses: actions/setup-node@v4.1.0
with:
node-version-file: .node-version
cache: 'npm'
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.8.1
uses: github/branch-deploy@v9.9.1
id: unlock-on-merge
with:
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow
Expand Down
30 changes: 15 additions & 15 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
"cheerio": "^1.0.0",
"cron": "^3.1.7",
"cross-env": "^7.0.3",
"discord-api-types": "^0.37.101",
"discord-api-types": "^0.37.103",
"discord.js": "^14.16.3",
"dotenv": "^16.4.5",
"got": "^14.4.2",
"i18next": "^23.15.1",
"i18next": "^23.16.4",
"moment": "^2.30.1",
"nodemon": "^3.1.7",
"turndown": "^7.2.0"
},
"devDependencies": {
"@railway/cli": "^3.14.0"
"@railway/cli": "^3.17.10"
}
}
Loading