Feature/great stuff 1737040573 (#87)

* addingGreatStuff-1737040573

* pipe updates

.github/workflows/merge-queue-post.yml

@@ -1,6 +1,7 @@
 name: Validate code in the merge queue (post merge)
 
 on:
+  workflow_dispatch:
   merge_group:
 
 jobs:
@@ -22,5 +23,4 @@ jobs:
           echo "$GITHUB_CONTEXT"
       - name: Merge queue pre-check
         run: |
-          sleep 15 && echo "Test"
-          #
+          sleep 15 && echo "Putting stuff in merge queue now that I am awake"

.github/workflows/pr-torelease.yml

@@ -61,17 +61,16 @@ jobs:
           echo 'latest release: ${{ steps.get_latest_release.outputs.result }}'
           echo LATEST_RELEASE=$(echo ${{ steps.get_latest_release.outputs.result }} | sed 's/"//g') >> "$GITHUB_OUTPUT"
       - run: "echo 'merge commit sha: ${{ github.event.pull_request.merge_commit_sha }}'"
-      - name: Create a PR
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
-          git config --global user.name "${{ github.actor }} (automated)"
-          git checkout release/${{ steps.latest_release.outputs.LATEST_RELEASE }}
-          # git cherry-pick -x ${{ github.event.pull_request.merge_commit_sha }} --strategy-option theirs
-          git cherry-pick -x ${{ github.event.pull_request.merge_commit_sha }}
-          git checkout -b unicorn/${{ github.event.pull_request.merge_commit_sha }}
-          git commit --allow-empty -am "Automated cherry-pick of ${{ github.event.pull_request.merge_commit_sha }}"
-          # git push --set-upstream origin unicorn/${{ github.event.pull_request.merge_commit_sha }}
-          echo "new branch created"
-          # gh pr create -B release/${{ steps.latest_release.outputs.LATEST_RELEASE }} -H unicorn/${{ github.event.pull_request.merge_commit_sha }} --title "Automated cherry-pick of ${{ github.event.pull_request.merge_commit_sha }}" --body "Automated cherry-pick of ${{ github.event.pull_request.merge_commit_sha }}"
+      # - name: Create a PR
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   run: |
+      #     git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+      #     git config --global user.name "${{ github.actor }} (automated)"
+      #     git checkout release/${{ steps.latest_release.outputs.LATEST_RELEASE }}
+      #     git cherry-pick -x ${{ github.event.pull_request.merge_commit_sha }}
+      #     git checkout -b unicorn/${{ github.event.pull_request.merge_commit_sha }}
+      #     git commit --allow-empty -am "Automated cherry-pick of ${{ github.event.pull_request.merge_commit_sha }}"
+      #     git push --set-upstream origin unicorn/${{ github.event.pull_request.merge_commit_sha }}
+      #     echo "new branch created"
+      #     gh pr create -B release/${{ steps.latest_release.outputs.LATEST_RELEASE }} -H unicorn/${{ github.event.pull_request.merge_commit_sha }} --title "Automated cherry-pick of ${{ github.event.pull_request.merge_commit_sha }}" --body "Automated cherry-pick of ${{ github.event.pull_request.merge_commit_sha }}"

.github/workflows/push.yml

@@ -1,22 +1,18 @@
-# name: Monorepo pipeline - build and deploy
-
-# on:
-#   push:
-#     branches:
-#       - 'main'
-#       - 'release/**'
-#       - 'pre-release/**'
-#   workflow_dispatch:
-#   create:
-#   pull_request:
-#     types:
-#       - opened
-#       - synchronize
-#       - labeled
-
-# defaults:
-#   run:
-#     shell: bash
+name: Monorepo pipeline - build and deploy
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'release/**'
+      - 'pre-release/**'
+  workflow_dispatch:
+  create:
+
+
+defaults:
+  run:
+    shell: bash
 
 # env:
 #   DOCKER_REGISTRY: some-registry
@@ -25,7 +21,17 @@
 #   COMPOSE_HTTP_TIMEOUT: 180
 #   NX_AFFECTED_ALL: ${{ contains(github.event.pull_request.labels.*.name, 'nx-affected-all') }}
 
-# jobs:
+jobs:
+  debug:
+    name: Dump Github context
+    runs-on: github-context
+    env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+    steps:
+      - name: Get git branch
+        run: |
+            echo "$GITHUB_CONTEXT"
+
 #   pre-checks:
 #     name: Check if job should run
 #     runs-on: ubuntu-latest

stuff.txt

@@ -27,3 +27,5 @@ Doing very important hotfix
 
 HalloGreatStuff-1736961437 - doing some important work
 
+HalloGreatStuff-1737040573
+