Merge pull request #733 from UN-OCHA/release-versions/v1.4.0

release versions/v1.4.0

.docksal/commands/post-deploy

@@ -37,11 +37,21 @@ done
 if $IMPORT_BACKUP; then
   BACKUP_DIRECTORY="$PROJECT_ROOT/.docksal/backups"
   echo "Looking for backups in ${BACKUP_DIRECTORY}"
-
-  FILENAME=$(ls -la ${BACKUP_DIRECTORY} | egrep '.sql.gz|.sql' | tail -n 1 | awk '{print $9}')
+  FILENAMES=(`ls -la ${BACKUP_DIRECTORY} | egrep '.sql.gz|.sql' | awk '{print $9}'`)
+  COUNT_FILES=${#FILENAMES[@]}
+  if [[ ${COUNT_FILES} -gt 1 ]]; then
+    echo "Found ${COUNT_FILES} files"
+    select FILENAME in ${FILENAMES[@]}; do
+      FILEPATH=${BACKUP_DIRECTORY}/${FILENAME}
+      break
+      done
+  elif [[ ${COUNT_FILES} -eq 1 ]]; then
+    echo "Found 1 file"
+    FILENAME=${FILENAMES[0]}
+  fi
   FILEPATH=${BACKUP_DIRECTORY}/${FILENAME}
   if [[ ! -z "$FILENAME" && -f "${FILEPATH}" ]]; then
-    echo "Found ${FILENAME}"
+    echo "Using ${FILENAME}"
 
     echo "Dropping existing tables"
     drush sql:drop -y >/dev/null
@@ -61,14 +71,8 @@ drush sset system.maintenance_mode 1 -y
 echo "Clear cache"
 drush cr
 
-echo "Run non-data updates"
-drush updatedb -y --no-post-updates
-
-echo "Import configuration"
-drush cim -y
-
-echo "Run all updates"
-drush updatedb -y
+echo "Run the deploy commands"
+drush deploy
 
 echo "Set maintenance mode to off"
 drush sset system.maintenance_mode 0 -y

.github/workflows/run-tests.yml

@@ -1,11 +1,17 @@
 name: Run tests
 
 on: [pull_request]
-
+  
 jobs:
   tests:
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: write 
+      checks: write
+      pull-requests: write 
+      actions: read 
+      statuses: write 
+
     steps:
       - name: Checkout Code
         id: checkout
@@ -33,8 +39,6 @@ jobs:
           run: |
             php --version && composer --version
 
-
-
       - name: Composer Validate
         id: validate
         uses: cafuego/command-output@main
@@ -244,4 +248,4 @@ jobs:
               ]
             }
         env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

README.md

@@ -74,13 +74,13 @@ Drupal best practices
 THEME SETUP
 -----------
 
-We have created a sub-theme [fts_public](https://github.com/UN-OCHA/fts-d8-site/tree/master/html/themes/custom/fts_public)
-from the OCHA provided base theme named [common_design](https://github.com/UN-OCHA/common_design).
+We have created a sub-theme common_design_subtheme from the OCHA provided base
+theme named [common_design](https://github.com/UN-OCHA/common_design).
 
 While working on style changes, update the _.sass_ files under the sass folder.
 Once done with the changes, run the below commands:
 
-    cd html/themes/custom/fts_public/
+    cd html/themes/custom/common_design_subtheme/
     nvm use
     npm install
     npm run sass:lint-fix