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

Jump to bottom

Combined PRs #276

Merged
merged 6 commits into from
Feb 8, 2024
Merged

Combined PRs #276

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14fca20
build(deps): bump the github-actions group with 3 updates
dependabot[bot] Feb 1, 2024
ead7396
build(deps): bump the npm-dependencies group with 8 updates
dependabot[bot] Feb 1, 2024
8771b04
Merge dependabot/npm_and_yarn/npm-dependencies-3827751f7c into combin…
the-hideout-combine-prs[bot] Feb 7, 2024
089f21d
Merge dependabot/github_actions/github-actions-8298a46b69 into combin…
the-hideout-combine-prs[bot] Feb 7, 2024
b0e3fe0
Merge branch 'main' into combined-prs-branch
Razzmatazzz Feb 8, 2024
cccec5d
select the `stash` service on deployments
GrantBirki Feb 8, 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
2 changes: 1 addition & 1 deletion .github/workflows/branch-deploy.yml
View file
Open in desktop
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/[email protected].0
uses: github/[email protected].1
with:
admins: the-hideout/core-contributors
admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

# validate JSON and YAML files
- name: json-yaml-validate
uses: GrantBirki/json-yaml-validate@v2.5.0
uses: GrantBirki/json-yaml-validate@v2.6.0
with:
comment: "true"
exclude_file: ".github/config/exclude.txt"
Expand Down
4 changes: 2 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,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
Expand Down Expand Up @@ -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
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/[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
Expand Down
148 changes: 60 additions & 88 deletions package-lock.json
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@
"type": "module",
"dependencies": {
"@discordjs/rest": "^2.2.0",
"@sentry/node": "^7.81.1",
"@sentry/tracing": "^7.81.1",
"@sentry/node": "^7.99.0",
"@sentry/tracing": "^7.99.0",
"ascii-table": "^0.0.9",
"cheerio": "^1.0.0-rc.12",
"cron": "^2.4.0",
"cross-env": "^7.0.3",
"discord-api-types": "^0.37.67",
"discord.js": "^14.14.1",
"dotenv": "^16.3.1",
"dotenv": "^16.4.1",
"got": "^13.0.0",
"i18next": "^23.7.6",
"moment": "^2.29.4",
"nodemon": "^3.0.1",
"i18next": "^23.8.2",
"moment": "^2.30.1",
"nodemon": "^3.0.3",
"turndown": "^7.1.2",
"uuid": "^9.0.0"
"uuid": "^9.0.1"
},
"devDependencies": {
"@railway/cli": "^3.4.0"
"@railway/cli": "^3.5.2"
}
}