Merge pull request #66 from Azure-Samples/jm-test-action-manual-branches

Jm test action manual branches

.cruft.json

@@ -1,7 +1,7 @@
 {
   "template": "https://github.com/kjaymiller/cookiecutter-relecloud",
-  "commit": "f77ad8b302ac9c3d851f82c7b875a200c8e876e2",
-  "checkout": null,
+  "commit": "9a4147023e7d1ab60accd7eca6ecbc8e2de38afb",
+  "checkout": "jm-on-stream",
   "context": {
     "cookiecutter": {
       "project_name": "Relecloud",
@@ -30,6 +30,7 @@
   },
   "directory": null,
   "skip": [
-    "lab"
+    "lab",
+    ".github/workflows"
   ]
 }

.github/workflows/cruft.yml

@@ -15,20 +15,20 @@ jobs:
         include:
           - add-paths: .
             body: Use this to merge the changes to this repository.
-            branch: cruft/update
+            branch: cruft/update${{ github.run_id }}
             commit-message: "chore: accept new Cruft update"
             title: New updates detected with Cruft
           - add-paths: .cruft.json
             body: Use this to reject the changes in this repository.
-            branch: cruft/reject
+            branch: cruft/reject${{ github.run_id }}
             commit-message: "chore: reject new Cruft update"
             title: Reject new updates detected with Cruft
     steps:
       - uses: actions/checkout@v3
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install Cruft
         run: pip3 install -r requirements-dev.in
@@ -39,7 +39,7 @@ jobs:
         run: |
           CHANGES=0
           if [ -f .cruft.json ]; then
-            if ! cruft check; then
+            if ! cruft check --checkout="jm-on-stream"; then
               CHANGES=1
             fi
           else
@@ -54,21 +54,15 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "GitHub"
 
-          cruft update --skip-apply-ask --refresh-private-variables
+          cruft update --checkout="jm-on-stream" --skip-apply-ask --refresh-private-variables
           git restore --staged .
 
       - name: Create pull request
         if: steps.check.outputs.has_changes == '1'
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          add-paths: ${{ matrix.add-paths }}
-          commit-message: ${{ matrix.commit-message }}
-          branch: ${{ matrix.branch }}
-          delete-branch: true
-          branch-suffix: timestamp
-          title: ${{ matrix.title }}
-          body: |
-            This is an autogenerated PR. ${{ matrix.body }}
-
-            [Cruft](https://cruft.github.io/cruft/) has detected updates from the Cookiecutter repository.
+        run: |
+          echo "::set-output name=branch::${{ matrix.branch }}"
+          echo "::set-output name=commit-message::${{ matrix.commit-message }}"
+          git checkout -b "${{ matrix.branch }}"
+          git add ${{ matrix.add-paths }}
+          git commit -m "${{ matrix.commit-message }}"
+          git push origin "${{ matrix.branch }}"