From fd8427a0b1866e4dd344103307d9e131424527cb Mon Sep 17 00:00:00 2001
From: matt <l3acon@gmail.com>
Date: Thu, 30 Nov 2023 15:41:09 -0700
Subject: [PATCH 01/23] round two

---
 product-demos-ee/execution-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product-demos-ee/execution-environment.yml b/product-demos-ee/execution-environment.yml
index 82c42758..b4b87d7a 100644
--- a/product-demos-ee/execution-environment.yml
+++ b/product-demos-ee/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 3
 images:
   base_image:
-    name: 'registry.redhat.io/ansible-automation-platform-22/ee-minimal-rhel8:latest'
+    name: 'registry.redhat.io/ansible-automation-platform-24/ee-minimal-rhel8:latest'
 
 dependencies:
   galaxy: requirements.yml

From 1118d7b7fc14dc2c71b23bd5090693276dfd667f Mon Sep 17 00:00:00 2001
From: matt <l3acon@gmail.com>
Date: Mon, 4 Dec 2023 08:42:50 -0700
Subject: [PATCH 02/23] add full repoistory name

---
 .github/workflows/pr-ee-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index de7b139d..8c3c4e0d 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -18,6 +18,7 @@ jobs:
       with:
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.ref != '' && github.event.pull_request.head.ref || 'main' }}
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
 
     - name: Fetch the base and head refs
       run: |

From 1279b48bac39333f91cc927b391a3e147b664c95 Mon Sep 17 00:00:00 2001
From: matt <l3acon@gmail.com>
Date: Mon, 4 Dec 2023 09:01:55 -0700
Subject: [PATCH 03/23] maybe this is it

---
 .github/workflows/pr-ee-build.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index 8c3c4e0d..31163e97 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -13,12 +13,15 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       length: ${{ steps.set-matrix.outputs.length }}
     steps:
-    - name: Checkout repo
-      uses: actions/checkout@v2
+    - name: Checkout main
+      uses: actions/checkout@v4
+
+    - name: Checkout external PR (or the same if you're Colin)
+      uses: actions/checkout@v4 
       with:
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.ref != '' && github.event.pull_request.head.ref || 'main' }}
-        repository: ${{ github.event.pull_request.head.repo.full_name }}
 
     - name: Fetch the base and head refs
       run: |

From d9b33d297fab63c98ac3ae7882208f1dd2e57fb9 Mon Sep 17 00:00:00 2001
From: Sean Cavanaugh <sean@cavanaugh.pro>
Date: Mon, 4 Dec 2023 13:49:52 -0500
Subject: [PATCH 04/23] Update requirements.yml

adding community.crypto to get of an error:

```
TASK [../../roles/gitlab_server : Git Post | Configure SSL] ********************
ERROR! couldn't resolve module/action 'get_certificate'. This often indicates a misspelling, missing collection, or incorrect module path.
The error appears to be in '/runner/project/roles/gitlab_server/tasks/certbot.yml': line 2, column 3, but may
be elsewhere in the file depending on the exact syntax problem.
The offending line appears to be:
---
- name: git pre | check to see if SSL cert already applied
```
---
 workshop_ee/requirements.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/workshop_ee/requirements.yml b/workshop_ee/requirements.yml
index aeafdd65..e2b302db 100644
--- a/workshop_ee/requirements.yml
+++ b/workshop_ee/requirements.yml
@@ -9,3 +9,4 @@ collections:
   - name: community.mysql
   - name: containers.podman
   - name: infra.controller_configuration
+  - name: community.crypto

From d98336ae94e4c462a1212b3f4e244c80096d10cd Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 14:26:46 -0500
Subject: [PATCH 05/23] quay to ghcr

---
 .github/workflows/pr-ee-build.yml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index 31163e97..9b21bccf 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -51,13 +51,15 @@ jobs:
     needs: [prepare-matrix]
     if: ${{ needs.prepare-matrix.outputs.length != '0' }}
     runs-on: ubuntu-latest
-    environment: deploy
+    environment: test
     strategy:
       matrix: ${{fromJson(needs.prepare-matrix.outputs.matrix)}}
       fail-fast: false
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Install python requirements (ansible-builder)
         run: pip install -r requirements.txt
@@ -68,19 +70,12 @@ jobs:
           SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-7)
           echo "IMAGE_TAG=pr-${{ github.event.number }}-$SHORT_SHA" >> $GITHUB_ENV
 
-      - name: Log in to quay.io
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: quay.io
-          username: ${{ secrets.REDHAT_USERNAME }}
-          password: ${{ secrets.REDHAT_PASSWORD }}
-
-      - name: Log in to registry.redhat.io
+      - name: Login to ghcr
         uses: redhat-actions/podman-login@v1
         with:
-          registry: registry.redhat.io
-          username: ${{ secrets.REDHAT_USERNAME }}
-          password: ${{ secrets.REDHAT_PASSWORD }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Substitute token for automation hub
         run: |
@@ -125,14 +120,12 @@ jobs:
           name: commands-${{ matrix.ee }}
           path: ${{ matrix.ee }}/commands-${{ matrix.ee }}.txt
 
-      - name: Push To quay.io
+      - name: Push To GHCR
         uses: redhat-actions/push-to-registry@v2
         with:
           image: ${{ env.EE }}
           tags: ${{ env.IMAGE_TAG }} ${{ github.sha }}
-          registry: quay.io/${{ secrets.QUAY_USER }}/
-          username: ${{ secrets.REDHAT_USERNAME }}
-          password: ${{ secrets.REDHAT_PASSWORD }}
+          registry: ghcr.io
 
       - name: Print summary
         run: |

From 7c7ccf80a7ce7364a7a323834518f590272cc1be Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 14:27:19 -0500
Subject: [PATCH 06/23] test build

---
 servicenow-ee/ansible-collections.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/servicenow-ee/ansible-collections.yml b/servicenow-ee/ansible-collections.yml
index c16d6d38..40f2f165 100644
--- a/servicenow-ee/ansible-collections.yml
+++ b/servicenow-ee/ansible-collections.yml
@@ -9,4 +9,3 @@ collections:
   - name: servicenow.itsm
     version: 2.2.0
   - name: kubealex.eda
-

From 230f8ab4c03c2c9242bbd0536ba809e32e3fd55d Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 14:35:00 -0500
Subject: [PATCH 07/23] redhat registry login

---
 .github/workflows/pr-ee-build.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index 9b21bccf..7cd8e0cf 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -77,6 +77,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Log in to registry.redhat.io
+        uses: redhat-actions/podman-login@v1
+        with:
+          registry: registry.redhat.io
+          username: ${{ secrets.REDHAT_SA_USERNAME }}
+          password: ${{ secrets.REDHAT_SA_PASSWORD }}
+
       - name: Substitute token for automation hub
         run: |
           sed -i "s/my_ah_token/${{ secrets.AH_TOKEN }}/1" ansible.cfg

From b572956d2fd3e0e189185a632f317eb33b4c802e Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 14:41:39 -0500
Subject: [PATCH 08/23] update ghcr push

---
 .github/workflows/pr-ee-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index 7cd8e0cf..fae27975 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -131,8 +131,8 @@ jobs:
         uses: redhat-actions/push-to-registry@v2
         with:
           image: ${{ env.EE }}
-          tags: ${{ env.IMAGE_TAG }} ${{ github.sha }}
-          registry: ghcr.io
+          tags: ${{ env.IMAGE_TAG }}
+          registry: ghcr.io/cloin
 
       - name: Print summary
         run: |

From 4957b371c09abd0ea3b92d501270e4280212e9ac Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 14:52:33 -0500
Subject: [PATCH 09/23] on pr target

---
 .github/workflows/pr-ee-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index fae27975..0aa2de7b 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -1,7 +1,7 @@
 name: Devel EE Build
 
 on:
-  pull_request:
+  pull_request_target:
     branches:
       - main
     types: [opened, reopened, synchronize]

From 5657e2f17bc0f167e38d79d074875ff425290cd7 Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 14:58:25 -0500
Subject: [PATCH 10/23] action summary

---
 .github/workflows/pr-ee-build.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index 0aa2de7b..1cc753fe 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -69,11 +69,12 @@ jobs:
           echo "EE=${{ matrix.ee }}" >> $GITHUB_ENV
           SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-7)
           echo "IMAGE_TAG=pr-${{ github.event.number }}-$SHORT_SHA" >> $GITHUB_ENV
+          echo "IMAGE_REGISTRY=ghcr.io" >> $GITHUB_ENV
 
       - name: Login to ghcr
         uses: redhat-actions/podman-login@v1
         with:
-          registry: ghcr.io
+          registry: ${{ env.IMAGE_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
@@ -132,13 +133,13 @@ jobs:
         with:
           image: ${{ env.EE }}
           tags: ${{ env.IMAGE_TAG }}
-          registry: ghcr.io/cloin
+          registry: ${{ env.IMAGE_REGISTRY }}/${{ github.repository_owner }}
 
       - name: Print summary
         run: |
           echo "## :rocket: Usage" >> $GITHUB_STEP_SUMMARY
-          echo "Image pushed to repository: quay.io/${{ secrets.QUAY_USER }}/${{ env.EE }}:${{ env.IMAGE_TAG }}" >> $GITHUB_STEP_SUMMARY
-          echo "> \`podman pull quay.io/${{ secrets.QUAY_USER }}/${{ env.EE }}:${{ env.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "Image pushed to repository: ${{ env.IMAGE_REGISTRY }}/${{ github.repository_owner }}/${{ env.EE }}:${{ env.IMAGE_TAG }}" >> $GITHUB_STEP_SUMMARY
+          echo "> \`podman pull ${{ env.IMAGE_REGISTRY }}/${{ github.repository_owner }}/${{ env.EE }}:${{ env.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
 
   post-comment:
     if: github.event_name == 'pull_request'

From ab340b170d82b0bd88347850adf3a5d1c883362b Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 15:07:48 -0500
Subject: [PATCH 11/23] checkout pr head

---
 .github/workflows/pr-ee-build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index 1cc753fe..59385c99 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -23,10 +23,10 @@ jobs:
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.ref != '' && github.event.pull_request.head.ref || 'main' }}
 
-    - name: Fetch the base and head refs
-      run: |
-        git fetch origin ${{ github.base_ref }}
-        git fetch origin ${{ github.head_ref }}
+    # - name: Fetch the base and head refs
+    #   run: |
+    #     git fetch origin ${{ github.base_ref }}
+    #     git fetch origin ${{ github.head_ref }}
 
     - name: Generate matrix  
       id: generate-matrix

From c1acdaa7441e075fff615d9ee37e7d1b427ffe1b Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 15:09:52 -0500
Subject: [PATCH 12/23] test build

---
 servicenow-ee/ansible-collections.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/servicenow-ee/ansible-collections.yml b/servicenow-ee/ansible-collections.yml
index 40f2f165..c16d6d38 100644
--- a/servicenow-ee/ansible-collections.yml
+++ b/servicenow-ee/ansible-collections.yml
@@ -9,3 +9,4 @@ collections:
   - name: servicenow.itsm
     version: 2.2.0
   - name: kubealex.eda
+

From e4e1e98f8fa79c5f818ef532c3b7a0de2ec18c75 Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 15:22:39 -0500
Subject: [PATCH 13/23] update comment condition

---
 .github/workflows/pr-ee-build.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index 59385c99..08f9b9e2 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -50,6 +50,8 @@ jobs:
   build-ee:
     needs: [prepare-matrix]
     if: ${{ needs.prepare-matrix.outputs.length != '0' }}
+    outputs:
+      push_success: ${{ steps.push_to_ghcr.outputs.push_success }}
     runs-on: ubuntu-latest
     environment: test
     strategy:
@@ -129,12 +131,17 @@ jobs:
           path: ${{ matrix.ee }}/commands-${{ matrix.ee }}.txt
 
       - name: Push To GHCR
+        id: push_to_ghcr
         uses: redhat-actions/push-to-registry@v2
         with:
           image: ${{ env.EE }}
           tags: ${{ env.IMAGE_TAG }}
           registry: ${{ env.IMAGE_REGISTRY }}/${{ github.repository_owner }}
 
+      - name: Set push success flag
+        if: success()
+        run: echo "push_success=true" >> $GITHUB_ENV
+
       - name: Print summary
         run: |
           echo "## :rocket: Usage" >> $GITHUB_STEP_SUMMARY
@@ -142,8 +149,8 @@ jobs:
           echo "> \`podman pull ${{ env.IMAGE_REGISTRY }}/${{ github.repository_owner }}/${{ env.EE }}:${{ env.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
 
   post-comment:
-    if: github.event_name == 'pull_request'
-    needs: build-ee 
+    needs: build-ee
+    if: ${{ needs.build-ee.outputs.push_success == 'true' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

From 3e45c2e6d2593596b424f223ec4cb95ba98f2308 Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 15:44:49 -0500
Subject: [PATCH 14/23] test builds

---
 servicenow-ee/ansible-collections.yml | 1 -
 swingsight-ee/requirements.yml        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/servicenow-ee/ansible-collections.yml b/servicenow-ee/ansible-collections.yml
index c16d6d38..40f2f165 100644
--- a/servicenow-ee/ansible-collections.yml
+++ b/servicenow-ee/ansible-collections.yml
@@ -9,4 +9,3 @@ collections:
   - name: servicenow.itsm
     version: 2.2.0
   - name: kubealex.eda
-
diff --git a/swingsight-ee/requirements.yml b/swingsight-ee/requirements.yml
index 8ee5009f..b17844b0 100644
--- a/swingsight-ee/requirements.yml
+++ b/swingsight-ee/requirements.yml
@@ -5,3 +5,4 @@ collections:
   - awx.awx
   - cloin.datadog
   - cloin.prometheus
+

From f14b682d16ae0165c76da88674ed79a09cfed830 Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 15:50:20 -0500
Subject: [PATCH 15/23] remove comment condition

---
 .github/workflows/pr-ee-build.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index 08f9b9e2..4dd240a0 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -23,11 +23,6 @@ jobs:
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.ref != '' && github.event.pull_request.head.ref || 'main' }}
 
-    # - name: Fetch the base and head refs
-    #   run: |
-    #     git fetch origin ${{ github.base_ref }}
-    #     git fetch origin ${{ github.head_ref }}
-
     - name: Generate matrix  
       id: generate-matrix
       run: |
@@ -150,7 +145,6 @@ jobs:
 
   post-comment:
     needs: build-ee
-    if: ${{ needs.build-ee.outputs.push_success == 'true' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

From deee42b3297f2e4ac33c499ec31f46543687c5ab Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 15:52:14 -0500
Subject: [PATCH 16/23] test builds

---
 base-de/execution-environment.yml       | 1 -
 servicenow-ee/execution-environment.yml | 1 -
 swingsight-ee/requirements.yml          | 1 -
 3 files changed, 3 deletions(-)

diff --git a/base-de/execution-environment.yml b/base-de/execution-environment.yml
index 44c945e1..c18910ee 100644
--- a/base-de/execution-environment.yml
+++ b/base-de/execution-environment.yml
@@ -1,6 +1,5 @@
 ---
 version: 3
-
 images:
     base_image:
         name: 'registry.redhat.io/ansible-automation-platform-24/de-minimal-rhel8:latest'
diff --git a/servicenow-ee/execution-environment.yml b/servicenow-ee/execution-environment.yml
index 7edb0d09..29aeccc8 100644
--- a/servicenow-ee/execution-environment.yml
+++ b/servicenow-ee/execution-environment.yml
@@ -29,4 +29,3 @@ additional_build_steps:
         # Use the above ARG to define an environment variable holding
         # the token for resolving private collections
         - ENV ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_TOKEN=$AH_TOKEN
-
diff --git a/swingsight-ee/requirements.yml b/swingsight-ee/requirements.yml
index b17844b0..8ee5009f 100644
--- a/swingsight-ee/requirements.yml
+++ b/swingsight-ee/requirements.yml
@@ -5,4 +5,3 @@ collections:
   - awx.awx
   - cloin.datadog
   - cloin.prometheus
-

From e6f8c2749cd89082ee1aaba4e07d859d0509cb0b Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 16:08:12 -0500
Subject: [PATCH 17/23] update comment

---
 .github/workflows/pr-ee-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index 4dd240a0..e957ea1f 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -98,10 +98,10 @@ jobs:
           # Create artifact file
           COMMANDS_FILE="commands-${{ matrix.ee }}.txt"
           echo "" >> $COMMANDS_FILE
-          echo "EE: ${{ env.EE }}" >> $COMMANDS_FILE
+          echo "${{ env.EE }}" >> $COMMANDS_FILE
           echo "" >> $COMMANDS_FILE
           echo "\`\`\`" > $COMMANDS_FILE
-          echo "podman pull quay.io/${{ secrets.QUAY_USER }}/${{ env.EE }}:${{ env.IMAGE_TAG }}" >> $COMMANDS_FILE
+          echo "podman pull ${{ env.IMAGE_REGISTRY }}/${{ github.repository_owner }}/${{ env.EE }}:${{ env.IMAGE_TAG }}" >> $COMMANDS_FILE
           echo "\`\`\`" >> $COMMANDS_FILE
           echo "<details>" >> $COMMANDS_FILE
           echo "<summary><b>More info...</b></summary>" >> $COMMANDS_FILE

From 3b16fe8e81b8ede666f3ee59e30b6295f91ab26f Mon Sep 17 00:00:00 2001
From: colin <colin@redhat.com>
Date: Mon, 4 Dec 2023 16:09:53 -0500
Subject: [PATCH 18/23] test builds

---
 base-de/execution-environment.yml       | 1 +
 bigpanda-ee/ansible-collections.yml     | 1 +
 servicenow-ee/execution-environment.yml | 1 -
 swingsight-ee/execution-environment.yml | 1 -
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/base-de/execution-environment.yml b/base-de/execution-environment.yml
index c18910ee..44c945e1 100644
--- a/base-de/execution-environment.yml
+++ b/base-de/execution-environment.yml
@@ -1,5 +1,6 @@
 ---
 version: 3
+
 images:
     base_image:
         name: 'registry.redhat.io/ansible-automation-platform-24/de-minimal-rhel8:latest'
diff --git a/bigpanda-ee/ansible-collections.yml b/bigpanda-ee/ansible-collections.yml
index 9e24a548..a00f03c3 100644
--- a/bigpanda-ee/ansible-collections.yml
+++ b/bigpanda-ee/ansible-collections.yml
@@ -5,3 +5,4 @@ collections:
   - ansible.utils
   - ansible.posix
   - bigpanda.incident
+
diff --git a/servicenow-ee/execution-environment.yml b/servicenow-ee/execution-environment.yml
index 29aeccc8..d40b996f 100644
--- a/servicenow-ee/execution-environment.yml
+++ b/servicenow-ee/execution-environment.yml
@@ -1,6 +1,5 @@
 ---
 version: 3
-
 images:
   base_image:
     name: registry.redhat.io/ansible-automation-platform-23/ee-minimal-rhel8:latest
diff --git a/swingsight-ee/execution-environment.yml b/swingsight-ee/execution-environment.yml
index 6d71cb11..e1b5f30e 100644
--- a/swingsight-ee/execution-environment.yml
+++ b/swingsight-ee/execution-environment.yml
@@ -1,6 +1,5 @@
 ---
 version: 1
-
 build_arg_defaults:
   EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-22/ee-supported-rhel8'
   

From 96125a3c6cdf15ef43cbcc39f7537a80c63ca897 Mon Sep 17 00:00:00 2001
From: Colin McNaughton <cloin@users.noreply.github.com>
Date: Tue, 5 Dec 2023 09:12:38 -0500
Subject: [PATCH 19/23] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 22c7c08c..ed2da94f 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 # Build execution environments with `ansible-builder`
 ## Building execution environment images for use in [ansible workshops](https://github.com/ansible/workshops)
-### This repo responds to modifications on `main` by building a new container image with Github Actions to be used as an execution environment for Ansible Automation Platform 2.
+### This repo responds to modifications on `main` and pull requests to main by building new container images with Github Actions to be used as an execution environment for Ansible Automation Platform 2.
 
 [![ServiceNow EE build](https://github.com/cloin/ee-builds/actions/workflows/servicenow-ee-build.yml/badge.svg)](https://github.com/cloin/ee-builds/actions/workflows/servicenow-ee-build.yml) [![Windows EE build](https://github.com/cloin/ee-builds/actions/workflows/windows-ee-build.yml/badge.svg)](https://github.com/cloin/ee-builds/actions/workflows/windows-ee-build.yml) [![f5 EE build](https://github.com/cloin/ee-builds/actions/workflows/f5-ee-build.yml/badge.svg)](https://github.com/cloin/ee-builds/actions/workflows/f5-ee-build.yml) [![RHEL 90 min EE build](https://github.com/cloin/ee-builds/actions/workflows/rhel_90-ee.yml/badge.svg?branch=main)](https://github.com/cloin/ee-builds/actions/workflows/rhel_90-ee.yml)
 
-![workflow](https://user-images.githubusercontent.com/8515817/140567781-616a7507-607e-41af-b668-4d3850776dc9.png)
+![workflow](https://github.com/cloin/ee-builds/assets/8515817/b18c02e4-4f9d-47a8-9e5c-6124c332e76a)
 
 ### Contributions
-The directories in this repository should follow the format that `ansible-builder` expects. See [servicenow-ee](https://github.com/cloin/ee-builds/tree/main/servicenow-ee) as an example. The name you give the directory should also be the name of the image. You can also copy the [servicenow-ee workflow](https://github.com/cloin/ee-builds/blob/main/.github/workflows/servicenow-ee-build.yml) file and adjust the parameters on lines 2 and 25-27. Questions? Open an issue!
+The directories in this repository should follow the format that `ansible-builder` expects. See [servicenow-ee](https://github.com/cloin/ee-builds/tree/main/servicenow-ee) as an example. The name you give the directory should also be the name of the image. You can also copy the [servicenow-ee workflow](https://github.com/cloin/ee-builds/blob/main/.github/workflows/servicenow-ee-build.yml) file and adjust the parameters. Questions? Open an issue!
 
 
 ### Useful documentation and links

From 0af774772c83cedbd7911c720559aad2a2f2f340 Mon Sep 17 00:00:00 2001
From: Colin McNaughton <cloin@users.noreply.github.com>
Date: Tue, 5 Dec 2023 09:14:08 -0500
Subject: [PATCH 20/23] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ed2da94f..4d0cfce3 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,8 @@
 
 [![ServiceNow EE build](https://github.com/cloin/ee-builds/actions/workflows/servicenow-ee-build.yml/badge.svg)](https://github.com/cloin/ee-builds/actions/workflows/servicenow-ee-build.yml) [![Windows EE build](https://github.com/cloin/ee-builds/actions/workflows/windows-ee-build.yml/badge.svg)](https://github.com/cloin/ee-builds/actions/workflows/windows-ee-build.yml) [![f5 EE build](https://github.com/cloin/ee-builds/actions/workflows/f5-ee-build.yml/badge.svg)](https://github.com/cloin/ee-builds/actions/workflows/f5-ee-build.yml) [![RHEL 90 min EE build](https://github.com/cloin/ee-builds/actions/workflows/rhel_90-ee.yml/badge.svg?branch=main)](https://github.com/cloin/ee-builds/actions/workflows/rhel_90-ee.yml)
 
-![workflow](https://github.com/cloin/ee-builds/assets/8515817/b18c02e4-4f9d-47a8-9e5c-6124c332e76a)
+![workflow](https://github.com/cloin/ee-builds/assets/8515817/1417c81b-a98d-4889-9bb3-0d133a54c8d0)
+
 
 ### Contributions
 The directories in this repository should follow the format that `ansible-builder` expects. See [servicenow-ee](https://github.com/cloin/ee-builds/tree/main/servicenow-ee) as an example. The name you give the directory should also be the name of the image. You can also copy the [servicenow-ee workflow](https://github.com/cloin/ee-builds/blob/main/.github/workflows/servicenow-ee-build.yml) file and adjust the parameters. Questions? Open an issue!

From a731799f5f5993dd78658980f0f1972c7de5829a Mon Sep 17 00:00:00 2001
From: Sean Cavanaugh <sean@cavanaugh.pro>
Date: Tue, 5 Dec 2023 09:33:04 -0500
Subject: [PATCH 21/23] Update requirements.yml

adding chocolatey.chocolatey

to fix this error
```
TASK [include_role : ../../roles/windows_ws_setup] *****************************
ERROR! couldn't resolve module/action 'chocolatey.chocolatey.win_chocolatey'. This often indicates a misspelling, missing collection, or incorrect module path.
The error appears to be in '/runner/project/roles/windows_ws_setup/tasks/chrome.yml': line 2, column 3, but may
be elsewhere in the file depending on the exact syntax problem.
The offending line appears to be:
---
- name: install Chocolatey
  ^ here
```
---
 workshop_ee/requirements.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/workshop_ee/requirements.yml b/workshop_ee/requirements.yml
index e2b302db..a8ef55af 100644
--- a/workshop_ee/requirements.yml
+++ b/workshop_ee/requirements.yml
@@ -10,3 +10,4 @@ collections:
   - name: containers.podman
   - name: infra.controller_configuration
   - name: community.crypto
+  - name: chocolatey.chocolatey

From f6e8232045d113ba62b351229ec10514454e5bdc Mon Sep 17 00:00:00 2001
From: matt <l3acon@gmail.com>
Date: Mon, 4 Dec 2023 08:42:50 -0700
Subject: [PATCH 22/23] add full repoistory name

---
 .github/workflows/pr-ee-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index e957ea1f..b3527222 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -22,6 +22,7 @@ jobs:
         repository: ${{ github.event.pull_request.head.repo.full_name }}
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.ref != '' && github.event.pull_request.head.ref || 'main' }}
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
 
     - name: Generate matrix  
       id: generate-matrix

From 673e5b89f7734522de0b2ce9448b8884c20267d3 Mon Sep 17 00:00:00 2001
From: matt <l3acon@gmail.com>
Date: Mon, 4 Dec 2023 09:01:55 -0700
Subject: [PATCH 23/23] maybe this is it

---
 .github/workflows/pr-ee-build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/pr-ee-build.yml b/.github/workflows/pr-ee-build.yml
index b3527222..e957ea1f 100644
--- a/.github/workflows/pr-ee-build.yml
+++ b/.github/workflows/pr-ee-build.yml
@@ -22,7 +22,6 @@ jobs:
         repository: ${{ github.event.pull_request.head.repo.full_name }}
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.ref != '' && github.event.pull_request.head.ref || 'main' }}
-        repository: ${{ github.event.pull_request.head.repo.full_name }}
 
     - name: Generate matrix  
       id: generate-matrix