Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:felddy/foundryvtt-docker into re…
Browse files Browse the repository at this point in the history
…lease/10.291.0
  • Loading branch information
felddy committed Dec 2, 2022
2 parents b1d8d7b + 360a974 commit d80c8bf
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f
uses: github/codeql-action/init@b2a92eb56d8cb930006a1c6ed86b0782dd8a4297
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a
Expand All @@ -68,7 +68,7 @@ jobs:
# Java). If this step fails, then you should remove it and run the build
# manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f
uses: github/codeql-action/autobuild@b2a92eb56d8cb930006a1c6ed86b0782dd8a4297

# ℹ️ Command-line programs to run using the OS shell. 📚
# https://git.io/JvXDl
Expand All @@ -82,4 +82,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f
uses: github/codeql-action/analyze@b2a92eb56d8cb930006a1c6ed86b0782dd8a4297
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
- name: 'Dependency Review'
uses: actions/dependency-review-action@0efb1d1d84fc9633afcdaad14c485cbbc90ef46c
uses: actions/dependency-review-action@11310527b429536e263dc6cc47873e608189ba21
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f # tag=v1.0.26
uses: github/codeql-action/upload-sarif@b2a92eb56d8cb930006a1c6ed86b0782dd8a4297 # tag=v1.0.26
with:
sarif_file: results.sarif
28 changes: 14 additions & 14 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"cheerio": "^1.0.0-rc.12",
"docopt": "^0.6.2",
"fetch-cookie": "^2.1.0",
"node-fetch": "^3.2.10",
"node-fetch": "^3.3.0",
"tough-cookie-file-store": "^2.0.3",
"winston": "^3.8.2"
},
Expand All @@ -17,7 +17,7 @@
"@types/docopt": "^0.6.33",
"@types/tough-cookie": "^4.0.2",
"@types/tough-cookie-file-store": "^2.0.1",
"typescript": "^4.8.4"
"typescript": "^4.9.3"
},
"homepage": "https://github.com/felddy/foundryvtt-docker#readme",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ def package_vars(version_file):
install_requires=[
"docker-compose == 1.29.2",
"semver == 2.13.0",
"setuptools == 65.5.0",
"wheel == 0.37.1",
"setuptools == 65.6.3",
"wheel == 0.38.4",
],
extras_require={
"test": [
Expand Down

0 comments on commit d80c8bf

Please sign in to comment.