Merge branch 'develop' into release

ajyey · Jun 4, 2024 · 2fa54f5 · 2fa54f5
2 parents b4f90ff + c87a348
commit 2fa54f5
Show file tree

Hide file tree

Showing 66 changed files with 146 additions and 561 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.yml b/.github/ISSUE_TEMPLATE/1_bug_report.yml
diff --git a/.github/ISSUE_TEMPLATE/2_feature_request.yml b/.github/ISSUE_TEMPLATE/2_feature_request.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
@@ -13,9 +13,6 @@ on:
       - "**/*.md"
       - "**.yml"
       - "!.github/workflows/axe.yml"
-      - "!.github/workflows/deploy-docker-tag.yml"
-      - "!.github/workflows/deploy-image.yml"
-      - "!.github/workflows/docker-slim.yml"
       - "!.github/workflows/lighthouse-badger.yml"
       - "!.github/workflows/prettier.yml"
       - "!lighthouse_results/**"

diff --git a/.github/workflows/deploy-docker-tag.yml b/.github/workflows/deploy-docker-tag.yml
diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,8 +3,7 @@ name: Deploy site
 on:
   push:
     branches:
-      - master
-      - main
+      - release
     paths:
       - "assets/**"
       - "**.html"
@@ -16,9 +15,6 @@ on:
       - "Gemfile.lock"
       - "!.github/workflows/axe.yml"
       - "!.github/workflows/broken-links.yml"
-      - "!.github/workflows/deploy-docker-tag.yml"
-      - "!.github/workflows/deploy-image.yml"
-      - "!.github/workflows/docker-slim.yml"
       - "!.github/workflows/lighthouse-badger.yml"
       - "!.github/workflows/prettier.yml"
       - "!lighthouse_results/**"
@@ -29,8 +25,7 @@ on:
       - "!README.md"
   pull_request:
     branches:
-      - master
-      - main
+      - release
     paths:
       - "assets/**"
       - "**.html"

diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml
diff --git a/.github/workflows/lighthouse-badger.yml b/.github/workflows/lighthouse-badger.yml
@@ -14,10 +14,10 @@ name: "Lighthouse Badger"
 
 # INPUTS as environmental variables (env) for not manually triggered workflows
 env:
-  URLS: https://alshedivat.github.io/al-folio/
+  URLS: https://ajey.github.io/
   TOKEN_NAME: LIGHTHOUSE_BADGER_TOKEN
   # If any of the following env is blank, a default value is used instead
-  REPO_BRANCH: "${{ github.repository }} master" # target repository & branch e.g. 'dummy/mytargetrepo main'
+  REPO_BRANCH: "${{ github.repository }} release" # target repository & branch e.g. 'dummy/mytargetrepo main'
   MOBILE_LIGHTHOUSE_PARAMS: "--only-categories=performance,accessibility,best-practices,seo --throttling.cpuSlowdownMultiplier=2"
   DESKTOP_LIGHTHOUSE_PARAMS: "--only-categories=performance,accessibility,best-practices,seo --preset=desktop --throttling.cpuSlowdownMultiplier=1"
 

diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
@@ -3,12 +3,11 @@ name: Prettier code formatter
 on:
   pull_request:
     branches:
-      - master
-      - main
+      - release
   push:
     branches:
-      - master
-      - main
+      - release
+      - develop
 
 jobs:
   check:

diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,4 @@ Gemfile.lock
 assets/libs/
 node_modules/
 vendor
-.idea
+.idea
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,12 +3,11 @@ name: Prettier code formatter @@
     on:
       pull_request:
         branches:
-          - master
-          - main
+          - release
       push:
         branches:
-          - master
-          - main
+          - release
+          - develop
     jobs:
       check:
@@ Expand Down @@