From c7e523cd202e948577496a5194b02b622232df58 Mon Sep 17 00:00:00 2001
From: Mitch Bradley <wmb@firmworks.com>
Date: Tue, 21 Dec 2021 14:39:23 -1000
Subject: [PATCH] Revised issue converter

---
 .github/workflows/convert-machine-file.yaml | 26 ++++----
 .github/workflows/convert_from_issue.yml    | 66 ---------------------
 2 files changed, 12 insertions(+), 80 deletions(-)
 delete mode 100644 .github/workflows/convert_from_issue.yml

diff --git a/.github/workflows/convert-machine-file.yaml b/.github/workflows/convert-machine-file.yaml
index 17a98c0a..366176d7 100644
--- a/.github/workflows/convert-machine-file.yaml
+++ b/.github/workflows/convert-machine-file.yaml
@@ -1,4 +1,4 @@
-name: comment
+name: Convert to FluidNC from Issue
 on:
   issues:
     types:
@@ -10,7 +10,11 @@ jobs:
     permissions:
       issues: write
     steps:
-      
+      - uses: actions/checkout@master
+        with:
+          repository: bdring/Grbl_Esp32
+          ref: refs/heads/DumpConfig
+
       - name: get attachment
         id: download
         run: |
@@ -19,7 +23,7 @@ jobs:
           echo "file_path=${url##*/}" >> $GITHUB_ENV
         env:
           body: ${{github.event.issue.body}}
-      
+
       - name: Cache pip
         uses: actions/cache@v2
         with:
@@ -33,10 +37,10 @@ jobs:
         with:
           path: ~/.platformio
           key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    
+
       - name: Set up Python
         uses: actions/setup-python@v2
-        
+
       - name: Install PlatformIO
         run: |
           python -m pip install --upgrade pip
@@ -46,14 +50,9 @@ jobs:
         run: |
           mv $file_path Grbl_Esp32/src/Machines/convert-job.h
           python convert-machine.py convert-job.h
-          printf "file_content<<EOF\n$(cat yaml/convert-job.yaml)\nEOF" >> $GITHUB_ENV
-      
-      - uses: octokit/request-action@v2.x
-        id: get_artifact_url
-        with:
-          route: GET /repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}    
+          echo 'file_content<<EOF' >> $GITHUB_ENV
+          cat cat yaml/convert-job.yaml >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
 
       - name: Add comment
         uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae
@@ -66,4 +65,3 @@ jobs:
             ```yaml 
             ${{ env.file_content }} 
             ```
-      
diff --git a/.github/workflows/convert_from_issue.yml b/.github/workflows/convert_from_issue.yml
deleted file mode 100644
index 418895ab..00000000
--- a/.github/workflows/convert_from_issue.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-name: Convert to FluidNC from Issue
-on:
-  issues:
-    types:
-    - opened
-jobs:
-  add-comment:
-    if: contains(github.event.issue.title, 'translate machine file')
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - uses: actions/checkout@master
-        with:
-          repository: bdring/Grbl_Esp32
-          ref: refs/heads/DumpConfig
-
-      - name: get attachment
-        id: download
-        run: |
-          url=($(echo $body | awk -v RS=\( -v FS=\) 'NR>1{print $1}' ))
-          curl -OL $url
-          echo "file_path=${url##*/}" >> $GITHUB_ENV
-        env:
-          body: ${{github.event.issue.body}}
-
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Cache PlatformIO
-        uses: actions/cache@v2
-        with:
-          path: ~/.platformio
-          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-
-      - name: Install PlatformIO
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade platformio
-          
-      - name: Convert File
-        run: |
-          mv $file_path Grbl_Esp32/src/Machines/convert-job.h
-          python convert-machine.py convert-job.h
-          echo 'file_content<<EOF' >> $GITHUB_ENV
-          cat cat yaml/convert-job.yaml >> $GITHUB_ENV
-          echo 'EOF' >> $GITHUB_ENV
-          
-      - name: Add comment
-        uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae
-        with:
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Dear ${{ github.event.issue.user.login }},
-            we converted your machine header-file ${{ env.file_path }} into a corresponding fluidNc yaml-file. 
-            Please copy the following content into your `config.yaml` file and upload the file to your esp32.
-            ```yaml 
-            ${{ env.file_content }} 
-            ```