Fixing ci pr devel 1.x

.github/workflows/ce-deploy-lint.yml

@@ -4,25 +4,28 @@ name: Linting
 on: pull_request
 
 jobs:
-  # Set the job key. The key is displayed as the job name
-  # when a job name is not provided
   run-linting:
-    # Name the Job
+    if: ${{ always() }}
     name: Linting
-    # Set the type of machine to run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-20.04 # at time of writing ubuntu-latest has broken ansible
 
     steps:
       # Checks out a copy of your repository on the ubuntu-latest machine
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - name: Checkout code.
+        uses: actions/checkout@v4
 
       # Linter checks.
-      - name: Run linters.
-        if: ${{ always() }}
+      - name: Install linters.
         run: |
           sudo apt-get update
+          sudo apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew"
           sudo apt-get install -y ansible-lint yamllint shellcheck
-          find ./roles -name "*.yml"  | xargs ansible-lint
-          yamllint ./roles
-          cd scripts && shellcheck *.sh
+
+      - name: Run ansible-lint.
+        run: find ./roles -name "*.yml"  | xargs ansible-lint
+
+      - name: Run yamllint.
+        run: yamllint ./roles
+
+      - name: Run shellcheck.
+        run: cd scripts && shellcheck *.sh

.github/workflows/ce-deploy-test-cewww.yml

@@ -0,0 +1,31 @@
+name: Run test on ce-deploy1
+
+# Run this workflow when a PR to 1.x is raised
+on:
+  pull_request:
+    branches:
+      - 1.x
+
+jobs:
+  # Set the job key. The key is displayed as the job name
+  # when a job name is not provided
+  run-tests:
+    if: ${{ github.event.pull_request.head.ref != 'documentation' }}
+    # Name the Job
+    name: Run Drupal test build
+    # Set the type of machine to run on
+    runs-on: ubuntu-latest
+
+    steps:
+      # Call the GitLab API to trigger a test build
+      - name: Call the GitLab API on ce-deploy1
+        env:
+          GITLAB_TOKEN: ${{ secrets.CEWWW_DEV_TOKEN }}
+        run: |
+          curl --request POST \
+            --form token=$GITLAB_TOKEN \
+            --form ref=dev \
+            --form "variables[CE_DEPLOY_BRANCH]=${{ github.event.pull_request.head.ref }}" \
+            "https://gitlab.ce-deploy1.codeenigma.net/api/v4/projects/4/trigger/pipeline"
+          echo -e "\n\n"
+          echo "### Request sent - see https://gitlab.ce-deploy1.codeenigma.net/web/ce-www/-/pipelines for results"

scripts/_common.sh

@@ -100,7 +100,7 @@ parse_options(){
       "--config-branch")
           shift
           git_checkout_config_dir "$1"
-        ;;    
+        ;;
       "--boto-profile")
           shift
           BOTO_PROFILE="$1"
@@ -116,7 +116,7 @@ parse_options(){
       "--build-id")
           shift
           BUILD_ID="$1"
-        ;;    
+        ;;
         *)
         usage
         exit 1
@@ -229,6 +229,8 @@ ansible_play(){
 # @param $1 absolute path to local repo.
 # @param $2 branch to checkout.
 git_checkout(){
+  # We need to fetch first for new branches.
+  git -C "$1" fetch origin "$2"
   git -C "$1" checkout "$2"
   git -C "$1" pull origin "$2"
 }