codestyle

evrone · Jul 24, 2024 · bf2b9f2 · bf2b9f2
1 parent 5db5a13
commit bf2b9f2
Show file tree

Hide file tree

Showing 44 changed files with 4,619 additions and 4,628 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,39 +1,39 @@
-# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files.
-
-# Ignore git directory.
-/.git/
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore all environment files (except templates).
-/.env*
-!/.env*.erb
-
-# Ignore all default key files.
-/config/master.key
-/config/credentials/*.key
-
-# Ignore all logfiles and tempfiles.
-/log/*
-/tmp/*
-!/log/.keep
-!/tmp/.keep
-
-# Ignore pidfiles, but keep the directory.
-/tmp/pids/*
-!/tmp/pids/.keep
-
-# Ignore storage (uploaded files in development and any SQLite databases).
-/storage/*
-!/storage/.keep
-/tmp/storage/*
-!/tmp/storage/.keep
-
-# Ignore assets.
-/node_modules/
-/app/assets/builds/*
-!/app/assets/builds/.keep
-/public/assets
-
-/node_modules
+# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files.
+
+# Ignore git directory.
+/.git/
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all environment files (except templates).
+/.env*
+!/.env*.erb
+
+# Ignore all default key files.
+/config/master.key
+/config/credentials/*.key
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/.keep
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/.keep
+
+# Ignore assets.
+/node_modules/
+/app/assets/builds/*
+!/app/assets/builds/.keep
+/public/assets
+
+/node_modules
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,85 +1,85 @@
-name: "CI"
-on:
-  push:
-    branches: [ "dev", "main" ]
-  pull_request:
-    branches: [ "dev", "main" ]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Prepare
-        run: cp ./.env.example ./.env
-
-      - name: Install ruby
-        uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
-        with:
-          ruby-version: '3.2.0'
-
-      - uses: satackey/action-docker-layer-caching@v0.0.11
-        continue-on-error: true
-
-      - name: Build image
-        run: make ci-build
-
-      - name: Save image
-        run: docker save --output /tmp/bmstu_2024-app.tar bmstu_2024-app
-
-      - name: Upload image
-        uses: actions/upload-artifact@v4
-        with:
-          name: bmstu_2024-app
-          path: /tmp/bmstu_2024-app.tar
-
-      - name: Clear
-        run: make ci-clear
-
-  codestyle:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Prepare
-        run: cp ./.env.example ./.env
-
-      - name: Download image
-        uses: actions/download-artifact@v4
-        with:
-          name: bmstu_2024-app
-          path: /tmp
-
-      - name: Load container
-        run: docker load --input /tmp/bmstu_2024-app.tar
-
-      - name: Check codestyle
-        run: make ci-rubocop
-
-      - name: Clear
-        run: make ci-clear
-
-  # healthcheck:
-  #   runs-on: ubuntu-latest
-  #   needs: build
-  #   steps:
-  #     - name: Checkout code
-  #       uses: actions/checkout@v4
-
-  #     - name: Prepare
-  #       run: cp ./.env.example ./.env
-
-  #     - name: Download image
-  #       uses: actions/download-artifact@v4
-  #       with:
-  #         name: bmstu_2024-app
-  #         path: /tmp
-
-  #     - name: Load container
-  #       run: docker load --input /tmp/bmstu_2024-app.tar
-
-  #     - name: Healthcheck
-  #       run: make ci-up-healthy
+name: "CI"
+on:
+  push:
+    branches: [ "dev", "main" ]
+  pull_request:
+    branches: [ "dev", "main" ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Prepare
+        run: cp ./.env.example ./.env
+
+      - name: Install ruby
+        uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
+        with:
+          ruby-version: '3.2.0'
+
+      - uses: satackey/action-docker-layer-caching@v0.0.11
+        continue-on-error: true
+
+      - name: Build image
+        run: make ci-build
+
+      - name: Save image
+        run: docker save --output /tmp/bmstu_2024-app.tar bmstu_2024-app
+
+      - name: Upload image
+        uses: actions/upload-artifact@v4
+        with:
+          name: bmstu_2024-app
+          path: /tmp/bmstu_2024-app.tar
+
+      - name: Clear
+        run: make ci-clear
+
+  codestyle:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Prepare
+        run: cp ./.env.example ./.env
+
+      - name: Download image
+        uses: actions/download-artifact@v4
+        with:
+          name: bmstu_2024-app
+          path: /tmp
+
+      - name: Load container
+        run: docker load --input /tmp/bmstu_2024-app.tar
+
+      - name: Check codestyle
+        run: make ci-rubocop
+
+      - name: Clear
+        run: make ci-clear
+
+  # healthcheck:
+  #   runs-on: ubuntu-latest
+  #   needs: build
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v4
+
+  #     - name: Prepare
+  #       run: cp ./.env.example ./.env
+
+  #     - name: Download image
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: bmstu_2024-app
+  #         path: /tmp
+
+  #     - name: Load container
+  #       run: docker load --input /tmp/bmstu_2024-app.tar
+
+  #     - name: Healthcheck
+  #       run: make ci-up-healthy
diff --git a/.gitignore b/.gitignore
@@ -1,66 +1,66 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore all environment files (except templates).
-/.env
-!/.env*.erb
-
-# Ignore all logfiles and tempfiles.
-/log/*
-/tmp/*
-!/log/.keep
-!/tmp/.keep
-
-# Ignore pidfiles, but keep the directory.
-/tmp/pids/*
-!/tmp/pids/
-!/tmp/pids/.keep
-
-# Ignore storage (uploaded files in development and any SQLite databases).
-/storage/*
-!/storage/.keep
-/tmp/storage/*
-!/tmp/storage/
-!/tmp/storage/.keep
-*.rdb
-
-/public/assets
-
-# Ignore master key for decrypting credentials and more.
-/config/master.key
-
-/app/assets/builds/*
-!/app/assets/builds/.keep
-
-/node_modules
-.env
-
-### VisualStudioCode ###
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-!.vscode/*.code-snippets
-
-# Local History for Visual Studio Code
-.history/
-
-# Built Visual Studio Code Extensions
-*.vsix
-
-### VisualStudioCode Patch ###
-# Ignore all local history of files
-.history
-.ionide
-
-# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,rails
-
-.DS_Store
-.idea/
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all environment files (except templates).
+/.env
+!/.env*.erb
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/
+!/tmp/pids/.keep
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/
+!/tmp/storage/.keep
+*.rdb
+
+/public/assets
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+
+/app/assets/builds/*
+!/app/assets/builds/.keep
+
+/node_modules
+.env
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
+
+# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,rails
+
+.DS_Store
+.idea/