feat: port timeout fix to v14 (#62)

* feat: port timeout fix to v14 * fix: indent * chore: prettier formatting * style: prettify code --------- Co-authored-by: agritheory <[email protected]>
agritheory · Feb 28, 2023 · 6f50230 · 6f50230
1 parent c4357a8
commit 6f50230
Show file tree

Hide file tree

Showing 22 changed files with 1,311 additions and 965 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -1,24 +1,40 @@
-name: Validate Diff Release
+name: Linters
 on:
   push:
-    branches: [ version-13 ]
+    branches: [ version-13, version-14 ]
   pull_request:
-    branches: [ version-13 ]
+    branches: [ version-13, version-14 ]
 
 env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  Diff:
-    needs: [ Validate_PY_JSON_MERGE ]
+  prettier:
+    needs: [ py_json_merge ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+          fetch-depth: 2
+
+      - name: Prettify code
+        uses: creyD/[email protected]
+        with:
+          commit_message: "style: prettify code"
+
+  json_diff:
+    needs: [ py_json_merge ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.ref }}
           fetch-depth: 2
 
-      - name: Find changed json
+      - name: Find JSON changes
         id: changed-json
         uses: tj-actions/[email protected]
         with:
@@ -68,29 +84,20 @@ jobs:
         run: |
           pip install rich
           pip install json_source_map
-          git clone --depth 1 https://gist.github.com/74017707b676c3ce947528fb00dd46d0.git fsjd
+          git clone --depth 1 https://gist.github.com/3eea518743067f1b971114f1a2016f69 fsjd
 
       - name: Diff table
         run: python3 fsjd/frappe_schema_json_diff.py base/mrd.txt head/acmr.txt 1
 
-
-  Release:
-    needs: [ Validate_PY_JSON_MERGE ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Release
-        run: npx semantic-release
-
-  Validate_PY_JSON_MERGE:
+  py_json_merge:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 
-      - name: Get validate_json
+      - name: Fetch validator
         run: git clone --depth 1 https://gist.github.com/f1bf2c11f78331b2417189c385022c28.git validate_json
 
-      - name: Validate json
+      - name: Validate JSON
         run: python3 validate_json/validate_json.py ./
 
       - name: Compile
@@ -102,4 +109,3 @@ jobs:
               then echo "Found merge conflicts"
               exit 1
           fi
-  
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,218 @@
+#-------------------------------------------------------------------------------------------------------------------
+# Keep this section in sync with .gitignore
+#-------------------------------------------------------------------------------------------------------------------
+
+*.pyc
+*.py~
+*.comp.js
+*.DS_Store
+locale
+.wnf-lang-status
+*.swp
+*.egg-info
+dist/
+# build/
+cloud_storage/docs/current
+cloud_storage/public/dist
+.vscode
+.vs
+node_modules
+.kdev4/
+*.kdev4
+*debug.log
+
+# Not Recommended, but will remove once webpack ready
+package-lock.json
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+# build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+.cypress-coverage
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+.static_storage/
+.media/
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# next.js build output
+.next
+
+# cypress
+cypress/screenshots
+cypress/videos
+
+# JetBrains IDEs
+.idea/
+
+#-------------------------------------------------------------------------------------------------------------------
+# Prettier-specific overrides
+#-------------------------------------------------------------------------------------------------------------------
+
+
+# Package manager files
+pnpm-lock.yaml
+yarn.lock
+package-lock.json
+shrinkwrap.json
+
+# Build outputs
+lib
+.github
+
+# Prettier reformats code blocks inside Markdown, which affects rendered output
+*.md
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,19 @@
+module.exports = {
+	arrowParens: 'avoid',
+	bracketSameLine: true,
+	bracketSpacing: true,
+	embeddedLanguageFormatting: 'auto',
+	htmlWhitespaceSensitivity: 'css',
+	insertPragma: false,
+	jsxSingleQuote: false,
+	printWidth: 120,
+	proseWrap: 'preserve',
+	quoteProps: 'as-needed',
+	requirePragma: false,
+	semi: false,
+	singleQuote: true,
+	tabWidth: 2,
+	trailingComma: 'es5',
+	useTabs: true,
+	vueIndentScriptAndStyle: false,
+}