Merge branch 'master' of https://github.com/aantakli/AJAN-editor

.github/workflows/docker-build.yml

@@ -6,41 +6,7 @@ on:
       - 'master'
 
 jobs:
-  docker:
-    name: Create Dockerimage
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Setup docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: aantakli/ajan-editor
-          tags: |
-            type=raw,latest
-            type=sha
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          secrets: |
-            GIT_AUTH_TOKEN=${{ secrets.GIT_TOKEN }}
   build:
-    name: Build
     runs-on: ubuntu-latest
     steps:
       - 
@@ -51,26 +17,26 @@ jobs:
         name: Checkout
         uses: actions/checkout@v2
       - 
-        name: Use Node.js
+        name: Use Node.js v8.6
         uses: actions/setup-node@v3
         with:
           node-version: '8.6'
+          cache: 'npm'
       - 
         name: Install dependencies
         run: npm install
       - 
-        name: Zip build Release
-        uses: vimtor/action-zip@v1
-        with:
-          recursive: true
-          files:  app/ ember-cli-build.js package.json SetupEditor.py testActionService.js vendor/ bower.json install_npm.bat startAll.bat testem.js config/ public/ startEditor.js test_rdf.txt mirage/ startReportService.bat tests/ npm/ reportService.js startTestActionService.bat node_modules/
-          dest: ajaneditor-${{ steps.commit.outputs.short }}.zip
+        name: Use zip
+        uses: montudor/action-zip@v1
+      - 
+        name: Zip node_modules
+        run: zip -qq -r modules.zip node_modules
       -
-        name: Temporally save release.zip
+        name: Temporally save dependencies
         uses: actions/upload-artifact@v3
         with:
-          name: release
-          path: ./ajaneditor-${{ steps.commit.outputs.short }}.zip
+          name: dependencies
+          path: modules.zip
   release:
     runs-on: ubuntu-latest
     needs: [build]
@@ -80,6 +46,28 @@ jobs:
         name: Get commit Hash
         id: commit
         uses: pr-mpt/actions-commit-hash@v1
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Load dependencies
+        uses: actions/download-artifact@v3
+        with:
+          name: dependencies
+          path: .
+      - 
+        uses: montudor/action-zip@v1
+        name: Unzip node_modules
+        with:
+          args: unzip -qq modules.zip -d .
+      - 
+        name: Remove Zipped modules
+        uses: JesseTG/[email protected]
+        with:
+          path: node_modules.zip
+      - 
+        name: Zip Release
+        run: zip -qq -r ajaneditor-${{ steps.commit.outputs.short }}.zip .     
       - 
         name: Create Release
         id: create_release
@@ -93,12 +81,6 @@ jobs:
             Current version of the AJAN-editor
           draft: false
           prerelease: false
-      -
-        name: Load release zip
-        uses: actions/download-artifact@v3
-        with:
-          name: release
-          path: .
       -
         name: upload release zip
         uses: actions/upload-release-asset@v1
@@ -108,4 +90,37 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./ajaneditor-${{ steps.commit.outputs.short }}.zip
           asset_name: ajaneditor-${{ steps.commit.outputs.short }}.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip  
+  docker:
+    name: Create Dockerimage
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Setup docker metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: aantakli/ajan-editor
+          tags: |
+            type=raw,latest
+            type=sha
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          secrets: |
+            GIT_AUTH_TOKEN=${{ secrets.GIT_TOKEN }}