Merge branch 'release/0.3.4'

eliashaeussler · Jan 14, 2022 · b5a49c0 · b5a49c0
2 parents 677a64c + 6f9e5e2
commit b5a49c0
Show file tree

Hide file tree

Showing 11 changed files with 172 additions and 160 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -3,8 +3,6 @@ on:
   push:
     tags:
       - '*'
-    branches:
-      - develop
   workflow_dispatch:
 
 # Prevents concurrent deployments
@@ -44,7 +42,7 @@ jobs:
           deployer-version: '7.0.0-rc.3'
 
   dev:
-    if: ${{ github.ref_name == 'develop' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-20.04
     environment:
       name: dev
@@ -72,5 +70,5 @@ jobs:
         with:
           private-key: ${{ secrets.SSH_PRIVATE_KEY }}
           known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
-          dep: deploy dev
+          dep: deploy dev --branch ${{ github.ref_name }}
           deployer-version: '7.0.0-rc.3'
diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/prod/webpack_encore.yaml b/config/packages/prod/webpack_encore.yaml
@@ -1,4 +1,4 @@
-#webpack_encore:
+webpack_encore:
     # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
     # Available in version 1.2
-    #cache: true
+    cache: true
diff --git a/config/packages/webpack_encore.yaml b/config/packages/webpack_encore.yaml
@@ -15,7 +15,7 @@ webpack_encore:
         # 'data-turbo-track': reload
 
     # If using Encore.enableIntegrityHashes() and need the crossorigin attribute (default: false, or use 'anonymous' or 'use-credentials')
-    # crossorigin: 'anonymous'
+    crossorigin: 'anonymous'
 
     # Preload all rendered script and link tags automatically via the HTTP/2 Link header
     # preload: true

diff --git a/deploy.php b/deploy.php
@@ -45,7 +45,7 @@
     ->set('writable_mode', 'chmod')
     ->set('deploy_path', '~/html/pre.typo3-badges.dev')
     ->add('shared_files', ['.htaccess'])
-    ->add('env', ['APP_ENV' => 'dev'])
+    ->add('env', ['APP_ENV' => 'prod'])
 ;
 
 // Tasks