Skip to content

Commit

Permalink
Merge pull request #276 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
GrantBirki authored Feb 8, 2024
2 parents 3658fc2 + cccec5d commit df76472
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 102 deletions.
2 changes: 1 addition & 1 deletion .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/[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
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
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
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

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

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,28 @@
"start": "node index.mjs",
"dev": "cross-env NODE_ENV=development NEW_RELIC_ENABLED=false nodemon --ignore cache/ -r dotenv/config index.mjs",
"dev-commands": "cross-env NODE_ENV=ci node deploy-commands-dev.mjs",
"deploy": "railway up"
"deploy": "railway up --service stash"
},
"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"
}
}

0 comments on commit df76472

Please sign in to comment.