Merge branch 'master' into dev

.github/workflows/main.yml

@@ -75,38 +75,38 @@ jobs:
         dest: '[email protected]:/home/platformcoop/domains/stage.commons.platform.coop/public_html/wp-content/themes/coop-library'
     - name: Display status from deploy
       run: echo "${{ steps.deploy.outputs.status }}"
-  # deploy-production:
-  #   needs: test
-  #   if: github.ref == 'refs/heads/master'
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - uses: actions/checkout@v1
-  #   - name: Cache node modules
-  #     uses: actions/cache@v1
-  #     with:
-  #       path: node_modules
-  #       key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
-  #   - name: npm install and build
-  #     run: |
-  #       npm install
-  #       npm run build:production
-  #     env:
-  #       CI: true
-  #   - name: Cache Composer packages
-  #     uses: actions/cache@v1
-  #     with:
-  #       path: vendor
-  #       key: ${{ runner.OS }}-build-${{ hashFiles('**/composer.lock') }}
-  #   - name: Composer install
-  #     run: composer install --no-dev --optimize-autoloader
-  #   - name: Deploy to production
-  #     id: deploy
-  #     uses: platform-coop-toolkit/rsync-deploy@master
-  #     env:
-  #       DEPLOY_KEY: ${{secrets.DEPLOY_KEY}}
-  #     with:
-  #       flags: "-azrh --delete --progress --exclude-from '.distignore'"
-  #       port: '22222'
-  #       dest: '[email protected]:/home/platformcoop/domains/library.platform.coop/public_html/wp-content/themes/coop-library'
-  #   - name: Display status from deploy
-  #     run: echo "${{ steps.deploy.outputs.status }}"
+  deploy-production:
+    needs: test
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: node_modules
+        key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
+    - name: npm install and build
+      run: |
+        npm install
+        npm run build:production
+      env:
+        CI: true
+    - name: Cache Composer packages
+      uses: actions/cache@v1
+      with:
+        path: vendor
+        key: ${{ runner.OS }}-build-${{ hashFiles('**/composer.lock') }}
+    - name: Composer install
+      run: composer install --no-dev --optimize-autoloader
+    - name: Deploy to production
+      id: deploy
+      uses: platform-coop-toolkit/rsync-deploy@master
+      env:
+        DEPLOY_KEY: ${{secrets.DEPLOY_KEY}}
+      with:
+        flags: "-azrh --delete --progress --exclude-from '.distignore'"
+        port: '22222'
+        dest: '[email protected]:/home/platformcoop/domains/resources.platform.coop/public_html/wp-content/themes/coop-library'
+    - name: Display status from deploy
+      run: echo "${{ steps.deploy.outputs.status }}"