Merge pull request #33 from FSTUM/dev

v3.0.0 Alpha1 Release

Author: CommanderStorm

.eslintrc

@@ -2,18 +2,18 @@
 
 version: 2
 updates:
-    - package-ecosystem: 'github-actions'
-      directory: '/' # Location of package manifests
-      schedule:
-          interval: 'weekly'
-      target-branch: 'dev'
-    - package-ecosystem: 'npm'
-      directory: '/' # Location of package manifests
-      schedule:
-          interval: 'monthly'
-      target-branch: 'dev'
-    - package-ecosystem: 'pip'
-      directory: '/' # Location of package manifests
-      schedule:
-          interval: 'monthly'
-      target-branch: 'dev'
+  - package-ecosystem: 'github-actions'
+    directory: '/' # Location of package manifests
+    schedule:
+      interval: 'weekly'
+    target-branch: 'dev'
+  - package-ecosystem: 'npm'
+    directory: '/' # Location of package manifests
+    schedule:
+      interval: 'monthly'
+    target-branch: 'dev'
+  - package-ecosystem: 'pip'
+    directory: '/' # Location of package manifests
+    schedule:
+      interval: 'monthly'
+    target-branch: 'dev'

.github/dependabot.yml

@@ -1,23 +1,32 @@
 name: Syncs this repo with the one hosted on private gitlab
 
 on:
-    push:
-        branches:
-            - 'main'
-    workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+      - 'dev'
+  workflow_dispatch:
 
 jobs:
-    git-sync:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  persist-credentials: false
-            - name: git-sync
-              uses: wei/git-sync@v3
-              with:
-                  source_repo: 'CommanderStorm/toptool-v2'
-                  source_branch: 'main'
-                  destination_repo: '[email protected]:elsinga/toptool.git'
-                  destination_branch: 'main'
-                  ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
+  git-sync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+      - name: git-sync
+        uses: wei/git-sync@v3
+        with:
+          source_repo: 'FSTUM/toptool-v3'
+          source_branch: 'main'
+          destination_repo: '[email protected]:fsmpi/toptool.git'
+          destination_branch: 'master'
+          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
+      - name: git-sync
+        uses: wei/git-sync@v3
+        with:
+          source_repo: 'FSTUM/toptool-v3'
+          source_branch: 'dev'
+          destination_repo: '[email protected]:fsmpi/toptool.git'
+          destination_branch: 'dev'
+          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}

.github/workflows/git_sync.yml

@@ -1,56 +1,58 @@
 name: Main CI
 
 on:
-    push:
-        branches:
-            - 'main'
-    pull_request:
-    workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+      - 'dev'
+  pull_request:
+  workflow_dispatch:
 
 jobs:
-    test:
-        runs-on: ubuntu-latest
-        strategy:
-            max-parallel: 4
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Setup Python
+        uses: actions/[email protected]
+        with:
+          python-version: '3.10'
+          cache: 'pip'
+          cache-dependency-path: 'requirements*.txt'
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt -r requirements_dev.txt
+          sudo apt-get update
+          sudo apt-get -qq install -y texlive-base texlive-lang-german texlive-fonts-recommended texlive-latex-extra latexmk
+          python manage.py collectstatic
+      - name: Run Tests
+        run: |
+          python manage.py test
+  pre-commit:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
 
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  ref: ${{ github.head_ref }}
-            - name: Setup Python
-              uses: actions/[email protected]
-              with:
-                  python-version: 3.9
-            - name: Install Dependencies
-              run: |
-                  python -m pip install --upgrade pip
-                  pip install -r requirements.txt -r requirements_dev.txt
-                  sudo apt-get update
-                  sudo apt-get -qq install -y texlive-base texlive-lang-german texlive-fonts-recommended texlive-latex-extra latexmk
-                  python manage.py collectstatic
-            - name: Run Tests
-              run: |
-                  python manage.py test
-    pre-commit:
-        runs-on: ubuntu-latest
-        strategy:
-            max-parallel: 4
-
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  ref: ${{ github.head_ref }}
-            - name: Setup Python
-              uses: actions/[email protected]
-              with:
-                  python-version: 3.9
-            - name: Install Dependencies
-              run: |
-                  python -m pip install --upgrade pip
-                  pip install -r requirements.txt -r requirements_dev.txt
-                  sudo apt-get update
-                  sudo apt-get -qq install -y gettext
-            - name: Run pre-commit
-              uses: pre-commit/[email protected]
-              with:
-                  token: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Setup Python
+        uses: actions/[email protected]
+        with:
+          python-version: '3.10'
+          cache: 'pip'
+          cache-dependency-path: 'requirements*.txt'
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt -r requirements_dev.txt
+          sudo apt-get update
+          sudo apt-get -qq install -y gettext
+      - name: Run pre-commit
+        uses: pre-commit/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/main-ci.yml

@@ -1,35 +1,38 @@
 name: npm-staticfiles updater
 
 on:
-    push:
-        branches:
-            - 'main'
-    workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+      - 'dev'
+  workflow_dispatch:
 
 jobs:
-    update_npm:
-        runs-on: ubuntu-latest
-        strategy:
-            max-parallel: 4
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  ref: ${{ github.head_ref }}
-            - uses: actions/[email protected]
-              with:
-                  python-version: 3.9
-            - name: Install Dependencies
-              run: |
-                  python -m pip install --upgrade pip
-                  pip install pre-commit
-                  sudo apt-get update
-                  sudo apt-get -qq install -y npm
-            - name: Install npm packages
-              continue-on-error: true
-              run: |
-                  npm install
-                  pre-commit run -a --config .pre-commit-only-line-endings-config.yaml
-            - name: Commit npm packages
-              uses: stefanzweifel/git-auto-commit-action@v4
-              with:
-                  commit_message: 'Automated Change: updated npm requirements'
+  update_npm:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+      - uses: actions/[email protected]
+        with:
+          python-version: '3.10'
+          cache: 'pip'
+          cache-dependency-path: 'requirements*.txt'
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pre-commit
+          sudo apt-get update
+          sudo apt-get -qq install -y npm
+      - name: Install npm packages
+        continue-on-error: true
+        run: |
+          npm install
+          pre-commit run -a --config .pre-commit-only-line-endings-config.yaml
+      - name: Commit npm packages
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 'Automated Change: updated npm requirements'

.github/workflows/npm_updates.yml

@@ -1,33 +1,35 @@
 name: dependabot for pre-commit
 
 on:
-    schedule:
-        # * is a special character in YAML so you have to quote this string
-        - cron: '0 19 * * 5' # monthly
+  schedule:
+    # * is a special character in YAML, so you have to quote this string
+    - cron: '0 19 * * 5' # monthly
 
-    workflow_dispatch:
+  workflow_dispatch:
 
 jobs:
-    update_pre-commit:
-        runs-on: ubuntu-latest
-        strategy:
-            max-parallel: 4
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  ref: ${{ github.head_ref }}
-            - uses: actions/[email protected]
-              with:
-                  python-version: 3.9
-            - name: Install Dependencies
-              run: |
-                  python -m pip install --upgrade pip
-                  pip install pre-commit
-            - name: install update pre-commit
-              run: |
-                  pre-commit autoupdate
-                  pre-commit autoupdate --config .pre-commit-only-line-endings-config.yaml
-            - name: Commit pre-commit file if changed
-              uses: stefanzweifel/git-auto-commit-action@v4
-              with:
-                  commit_message: 'Automated Change: updated pre-commit requirements'
+  update_pre-commit:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+      - uses: actions/[email protected]
+        with:
+          python-version: '3.10'
+          cache: 'pip'
+          cache-dependency-path: 'requirements*.txt'
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pre-commit
+      - name: install update pre-commit
+        run: |
+          pre-commit autoupdate
+          pre-commit autoupdate --config .pre-commit-only-line-endings-config.yaml
+      - name: Commit pre-commit file if changed
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 'Automated Change: updated pre-commit requirements'