Bläddra i källkod

merge(#1174): from ci/refactor into dev

Sukka 5 år sedan
förälder
incheckning
bdf3e29ac3

+ 0 - 37
.github/workflows/autominifycss.yml

@@ -1,37 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Auto Minify CSS file
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the dev branch
-on:
-  push:
-    branches: [ dev ]
-  pull_request:
-    branches: [ dev ]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      # Runs a single command using the runners shell
-      - name: Auto Minify CSS file
-        uses: nizarmah/auto-minify@master
-        with:
-          directory: 'public/assets/css'
-
-      # Runs a set of commands using the runners shell
-      - name: Auto committing minified files
-        uses: stefanzweifel/[email protected]
-        with:
-          repository: 'public/assets/css'
-          commit_message: "Github Action: Auto Minified CSS file"
-          branch: ${{ github.ref }}

+ 0 - 37
.github/workflows/autominifyjs.yml

@@ -1,37 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Auto Minify JS file
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the dev branch
-on:
-  push:
-    branches: [ dev ]
-  pull_request:
-    branches: [ dev ]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      # Runs a single command using the runners shell
-      - name: Auto Minify JS file
-        uses: nizarmah/auto-minify@master
-        with:
-          directory: 'public/assets/js'
-
-      # Runs a set of commands using the runners shell
-      - name: Auto committing minified files
-        uses: stefanzweifel/[email protected]
-        with:
-          repository: 'public/assets/js'
-          commit_message: "Github Action: Auto Minified JS file"
-          branch: ${{ github.ref }}

+ 0 - 37
.github/workflows/autominifythemejs.yml

@@ -1,37 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Auto Minify Theme JS file
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the dev branch
-on:
-  push:
-    branches: [ dev ]
-  pull_request:
-    branches: [ dev ]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      # Runs a single command using the runners shell
-      - name: Auto Minify Theme JS file
-        uses: nizarmah/auto-minify@master
-        with:
-          directory: 'public/theme/material/js'
-
-      # Runs a set of commands using the runners shell
-      - name: Auto committing minified files
-        uses: stefanzweifel/[email protected]
-        with:
-          repository: 'public/theme/material/js'
-          commit_message: "Github Action: Auto Minified Theme JS file"
-          branch: ${{ github.ref }}

+ 1 - 1
.github/workflows/continuous-integration.yml → .github/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Build Docker
 on:
   push:
     branches:

+ 20 - 13
.github/workflows/autominifythemecss.yml → .github/workflows/minify.yml

@@ -1,37 +1,44 @@
 # This is a basic workflow to help you get started with Actions
 
-name: Auto Minify Theme CSS file
+name: Auto Minify CSS/JS file
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the dev branch
 on:
   push:
     branches: [ dev ]
+    paths:
+      - 'public/assets/css/**'
+      - 'public/assets/js/**'
+      - 'public/theme/material/css/**'
+      - 'public/theme/material/js/**'
   pull_request:
     branches: [ dev ]
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-
-      # Runs a single command using the runners shell
       - name: Auto Minify Theme CSS file
         uses: nizarmah/auto-minify@master
         with:
           directory: 'public/theme/material/css'
-
-      # Runs a set of commands using the runners shell
+      - name: Auto Minify Theme JS file
+        uses: nizarmah/auto-minify@master
+        with:
+          directory: 'public/theme/material/js'
+      - name: Auto Minify CSS file
+        uses: nizarmah/auto-minify@master
+        with:
+          directory: 'public/assets/css'
+      - name: Auto Minify JS file
+        uses: nizarmah/auto-minify@master
+        with:
+          directory: 'public/assets/js'
       - name: Auto committing minified files
         uses: stefanzweifel/[email protected]
         with:
-          repository: 'public/theme/material/css'
-          commit_message: "Github Action: Auto Minified Theme CSS file"
+          repository: 'public'
+          commit_message: "Github Action: Auto Minified Theme CSS/JS Files"
           branch: ${{ github.ref }}