Skip to content

Commit

Permalink
Merge branch 'develop' into amesh-new-engine
Browse files Browse the repository at this point in the history
  • Loading branch information
m77so authored Jun 4, 2022
2 parents 40a3331 + c3fadbf commit 1111974
Show file tree
Hide file tree
Showing 49 changed files with 993 additions and 872 deletions.
1 change: 0 additions & 1 deletion .dockerignore

This file was deleted.

7 changes: 7 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.env
.DS_Store
__pycache__/
.vscode/
.mypy_cache/
node_modules/
docker-compose.yml
3 changes: 3 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[flake8]
max-line-length = 120
extend-ignore = E203
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ updates:
open-pull-requests-limit: 1
- package-ecosystem: docker
directory: "/"
schedule:
interval: "daily"
ignore:
- dependency-name: python
versions:
- 3.11.0b1-slim-bullseye
open-pull-requests-limit: 1
- package-ecosystem: docker
directory: "/postgres"
schedule:
interval: "daily"
open-pull-requests-limit: 1
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pr-check-yarn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ name: pr-check-yarn
on:
pull_request:

permissions:
contents: write
pull-requests: write

jobs:
# package.jsonかyarn.lockに差分があれば、package.jsonからyarn.lockを作り出す
pr-check-yarn:
Expand All @@ -18,7 +22,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
- run: echo "NODE_VERSION=16" >> "${GITHUB_ENV}"
- name: Set up Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v3.1.1
uses: actions/setup-node@v3.2.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/pr-close-hato-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ jobs:
# PR close時にCIが出したPRをcloseする
pr-close-hato-bot:
runs-on: ubuntu-latest

permissions:
contents: write
pull-requests: write
steps:
- run: |
REPO_NAME="${{ github.event.pull_request.head.repo.full_name }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-copy-ci-hato-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
find hato-bot/${worklows_path} -type f \
-not -name "*hato-bot.yml" \
-exec cp {} "${DEST_PATH}" \;
for f in .markdown-lint.yml .python-lint .textlintrc .gitleaks.toml .mypy.ini .pre-commit-config.yaml .python-version
for f in .markdown-lint.yml .python-lint .textlintrc .gitleaks.toml .mypy.ini .pre-commit-config.yaml .python-version .pep8 .flake8
do
cp hato-bot/${f} sudden-death/
done
Expand Down
Loading

0 comments on commit 1111974

Please sign in to comment.