Skip to content

Commit

Permalink
Merge branch 'master' into use_ts_4
Browse files Browse the repository at this point in the history
  • Loading branch information
massongit authored Nov 17, 2024
2 parents 5e13ab0 + 70eb71b commit 75d9a9b
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 63 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/format-json-yml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
token: ${{steps.generate_token.outputs.token}}
- uses: dev-hato/actions-format-json-yml@a459ba1d456f396f983ba248015e0dcc8aff8230 # v0.0.77
- uses: dev-hato/actions-format-json-yml@d734536c3d78cd63c0be271d4fa1df500ce3c29f # v0.0.78
with:
github-token: ${{steps.generate_token.outputs.token}}
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-copy-ci-sudden-death.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
process.env.GITHUB_WORKSPACE + '/sudden-death/'
)
script()
- uses: dev-hato/actions-diff-pr-management@e5c78b251a69f44f93b2f1398e06b129bcf151ec # v1.2.0
- uses: dev-hato/actions-diff-pr-management@8d475e5bc78f61c40024d4859b79134b66f788d2 # v1.2.1
with:
github-token: ${{steps.generate_token.outputs.token}}
branch-name-prefix: pr-copy-ci
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
- name: Set up Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
id: setup_python
if: github.event_name != 'pull_request' || github.event.action != 'closed'
with:
Expand All @@ -44,7 +44,7 @@ jobs:
id: format
if: github.event_name != 'pull_request' || github.event.action != 'closed'
run: bash "${GITHUB_WORKSPACE}/scripts/pr_format/pr_format/format.sh"
- uses: dev-hato/actions-diff-pr-management@e5c78b251a69f44f93b2f1398e06b129bcf151ec # v1.2.0
- uses: dev-hato/actions-diff-pr-management@8d475e5bc78f61c40024d4859b79134b66f788d2 # v1.2.1
if: success() || failure()
with:
github-token: ${{secrets.GITHUB_TOKEN}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
submodules: "recursive"
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version-file: .python-version
cache: pipenv
Expand All @@ -26,7 +26,7 @@ jobs:
DEST_PATH: "/home/runner/work/_temp/_github_workflow/.venv"
run: bash "${GITHUB_WORKSPACE}/scripts/pr_test/pr_super_lint/set_venv_path.sh"
- name: Set up Node.js
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
cache: npm
node-version-file: package.json
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-update-gitleaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ jobs:
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
if: github.event_name != 'pull_request' || github.event.action != 'closed'
with:
cache: npm
node-version-file: package.json
- name: Install packages
if: github.event_name != 'pull_request' || github.event.action != 'closed'
run: bash "${GITHUB_WORKSPACE}/scripts/npm_ci.sh"
- uses: dev-hato/actions-update-gitleaks@a1fa480c98add29b8e018c4e4bcd541d45766433 # v0.0.81
- uses: dev-hato/actions-update-gitleaks@3ef8b2a72aff26753f47e2f161f895c1be0ab3c5 # v0.0.82
with:
github-token: ${{secrets.GITHUB_TOKEN}}
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-update-readme-sudden-death.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
- if: github.event_name != 'pull_request' || github.event.action != 'closed'
run: sed -i -e "s/Python [0-9.]*/Python $(cat .python-version)/g" README.md
- uses: dev-hato/actions-diff-pr-management@e5c78b251a69f44f93b2f1398e06b129bcf151ec # v1.2.0
- uses: dev-hato/actions-diff-pr-management@8d475e5bc78f61c40024d4859b79134b66f788d2 # v1.2.1
with:
github-token: ${{secrets.GITHUB_TOKEN}}
branch-name-prefix: readme
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ flake8 = "==7.1.1"
importlib-metadata = "==8.5.0"
toml = "==0.10.2"
types-toml = "==0.10.8.20240310"
setuptools = "==75.2.0"
setuptools = "==75.5.0"

[packages]
pyperclip = ">=1.5.27"
Expand Down
20 changes: 10 additions & 10 deletions Pipfile.lock

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

73 changes: 31 additions & 42 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pipenv==2024.2.0
pipenv==2024.4.0

0 comments on commit 75d9a9b

Please sign in to comment.