ChallengeDac pull request

.github/pull_request_template.md

@@ -7,9 +7,9 @@
 
 ### For which grant [level](https://github.com/eosnetworkfoundation/grant-framework#grant-levels) are you applying?
 
-- [ ] **Level 1**:  Up to $10,000, 2 approvals
-- [ ] **Level 2**:  Up to $50,000, 3 approvals
-- [ ] **Level 3**:  Unlimited, 4 approvals
+- [ ] **Level 1**:  Up to  $10,000, 2 approvals
+- [ ] **Level 2**:  Up to  $50,000, 3 approvals
+- [ ] **Level 3**:  Up to $200,000, 4 approvals
 
 ### Application Checklist
 

.github/workflows/am-big-gsheet.yml

@@ -0,0 +1,78 @@
+name: AM Reusable Gsheet Update
+on:
+  workflow_call:
+    inputs:
+      project_name:
+        required: true
+        type: string
+      contact_name:
+        required: true
+        type: string
+      team_name:
+        required: true
+        type: string
+      app_email:
+        required: true
+        type: string
+      total_cost:
+        required: true
+        type: string
+      legal_entity:
+        required: true
+        type: string
+      legal_addr:
+        required: true
+        type: string
+      level:
+        required: true
+        type: string
+      eos_addr:
+        required: true
+        type: string
+      github_actor:
+        required: true
+        type: string
+      pr_no:
+        required: true
+        type: string
+      website:
+        required: true
+        type: string
+      open_source:
+        required: true
+        type: string
+      token_sale:
+        required: true
+        type: string
+      basename:
+        required: true
+        type: string
+
+    secrets:
+      gsheet_private_key:
+        required: true
+
+jobs:
+  appendrow:
+    runs-on: ubuntu-latest
+    steps:
+      - id: 'update_worksheet'
+        uses: jroehl/gsheet.action@v1.2.0
+        with:
+          spreadsheetId: 128L-4NQpOT0f2MLRcd5NiNAMsxS_Y1XGqFRXnyxtfLk
+          commands: |
+            [
+              { "command": "appendData", "args": { "data": [["${{ inputs.pr_no }}", "${{ inputs.project_name }}", 
+                "${{ inputs.team_name }}", 
+                "${{ inputs.open_source }}", "${{ inputs.token_sale }}", 
+                "${{ inputs.level }}", "${{ inputs.total_cost }}", 
+                "${{ inputs.eos_addr }}",
+                "${{ inputs.github_actor }}", 
+                "${{ inputs.website }}", "${{ inputs.basename }}",
+                "${{ inputs.contact_name }}", "${{ inputs.app_email }}", 
+                "${{ inputs.legal_entity }}", "${{ inputs.legal_addr }}"
+                ]], "worksheetTitle": "GrantInfo", "minCol": 1 }}
+            ]
+        env:
+          GSHEET_CLIENT_EMAIL: enf-grant-service-account@sonorous-haven-350712.iam.gserviceaccount.com
+          GSHEET_PRIVATE_KEY: ${{ secrets.gsheet_private_key }}

.github/workflows/am-big-parser.yml

@@ -0,0 +1,110 @@
+# Parse the ENF Grant Framework Application and return the important parts
+# Alysha Mims modified copy of - Ted Cahall 25May2022 - 
+#                                           30June2022 modified to scrape more fields.
+#                                           12Nov2022 - Added more fields for the Big Scrape and made a new file from old one
+# File may be called from a PR or with a filename passed in (not associated with a PR)
+#
+name: AM Reusable "Big" Application Parser
+on:
+  workflow_call:
+    inputs:
+      filename:
+        required: true
+        type: string
+    outputs:
+      app_email:
+        value: ${{ jobs.parse.outputs.app_email }}
+      contact_name:
+        value: ${{ jobs.parse.outputs.contact_name }}
+      project_name:
+        value: ${{ jobs.parse.outputs.project_name }}
+      team_name:
+        value: ${{ jobs.parse.outputs.team_name }}
+      total_cost:
+        value: ${{ jobs.parse.outputs.total_cost }}
+      legal_entity:
+        value: ${{ jobs.parse.outputs.legal_entity }}
+      legal_addr:
+        value: ${{ jobs.parse.outputs.legal_addr }}
+      level:
+        value: ${{ jobs.parse.outputs.level }}
+      eos_addr:
+        value: ${{ jobs.parse.outputs.eos_addr }}
+      repo_owner:
+        value: ${{ jobs.parse.outputs.repo_owner }}
+      github_actor:
+        value: ${{ jobs.parse.outputs.github_actor }}
+      pr_no:
+        value: ${{ jobs.parse.outputs.pr_no }}
+      website:
+        value: ${{ jobs.parse.outputs.website }}
+      open_source:
+        value: ${{ jobs.parse.outputs.open_source }}
+      token_sale:
+        value: ${{ jobs.parse.outputs.token_sale }}
+      basename:
+        value: ${{ jobs.parse.outputs.basename }}
+
+jobs:
+  parse:
+    #if: inputs.filename
+    runs-on: ubuntu-latest
+    outputs:
+      app_email: ${{ steps.grep_appl.outputs.email_addr }}
+      contact_name: ${{ steps.grep_appl.outputs.contact_name }}
+      project_name: ${{ steps.grep_appl.outputs.project_name }}
+      team_name: ${{ steps.grep_appl.outputs.team_name }}
+      total_cost: ${{ steps.grep_appl.outputs.total_cost }}
+      legal_entity: ${{ steps.grep_appl.outputs.legal_entity }}
+      legal_addr: ${{ steps.grep_appl.outputs.legal_addr }}
+      level: ${{ steps.grep_appl.outputs.level }}
+      eos_addr: ${{ steps.grep_appl.outputs.eos_addr }}
+      basename: ${{ steps.grep_appl.outputs.basename }}
+      github_actor: ${{ steps.grep_appl.outputs.github_actor }}
+      pr_no: ${{ steps.grep_appl.outputs.pr_no }}
+      website: ${{ steps.grep_appl.outputs.website }}
+      open_source: ${{ steps.grep_appl.outputs.open_source }}
+      token_sale: ${{ steps.grep_appl.outputs.token_sale }}
+
+    steps:
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      # Parse the application template for the required fields
+      - name: assign the env variables from the parsing
+        id: grep_appl
+        run: |
+          export APP_EMAIL=`/bin/grep -F "**Contact Email:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f4`
+          echo "email_addr=$APP_EMAIL" >> $GITHUB_OUTPUT
+          export CNAME=`/bin/grep -F "**Contact Name:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f4-8`
+          echo "contact_name=$CNAME" >> $GITHUB_OUTPUT
+          export PNAME=`/bin/grep -F "**Project Name:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f4-10`
+          echo "project_name=$PNAME" >> $GITHUB_OUTPUT
+          export TNAME=`/bin/grep -F "**Team Name:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f4-10`
+          echo "team_name=$TNAME" >> $GITHUB_OUTPUT
+          export TCOST=`/bin/grep -F "**Total Costs:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f4-8`
+          echo "total_cost=$TCOST" >> $GITHUB_OUTPUT
+          export LENTITY=`/bin/grep -F "**Registered Legal Entity:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f5-12`
+          echo "legal_entity=$LENTITY" >> $GITHUB_OUTPUT
+          export LADDR=`/bin/grep -F "**Registered Address:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f4-30`
+          echo "legal_addr=$LADDR" >> $GITHUB_OUTPUT
+          export LEVEL=`/bin/grep -F "**[Level](https" ${{ inputs.filename }} | tr -s " " | cut -d" " -f3-8`
+          echo "level=$LEVEL" >> $GITHUB_OUTPUT
+          export EOSADDR=`/bin/grep -F "**EOS Payment Address:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f5-8`
+          echo "eos_addr=$EOSADDR" >> $GITHUB_OUTPUT
+          export WEBSITE=`/bin/grep -F "**Website:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f3-8`
+          echo "website=$WEBSITE" >> $GITHUB_OUTPUT
+          export OPENSOURCE=`/bin/grep -F "**Project is Open-Source:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f5`
+          echo "open_Source=$OPENSOURCE" >> $GITHUB_OUTPUT
+          export TOKENSALE=`/bin/grep -F "**Project was part of Token sale:**" ${{ inputs.filename }} | tr -s " " | cut -d" " -f8`
+          echo "token_sale=$TOKENSALE" >> $GITHUB_OUTPUT
+          # following three only work when parser launched by a pull request
+          echo "repo_owner=${{ github.event.pull_request.head.repo.owner.login }}" >> $GITHUB_OUTPUT
+          echo "pr_no=${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
+          echo "github_actor=${{ github.actor }}" >> $GITHUB_OUTPUT
+          export BASENAME=`/bin/echo ${{ inputs.filename }} | cut -d"/" -f2`
+          echo "basename=$BASENAME" >> $GITHUB_OUTPUT
+          echo $BASENAME

.github/workflows/am-scrape-appfile.yml

@@ -0,0 +1,78 @@
+# Scrape application file to the "DataBigScrape" spreadsheet
+# Alysha Mims copy of Ted Cahall 12Nov2022
+#
+
+name: AM Scrape Application to Gsheet
+
+on:
+  workflow_dispatch:
+    inputs:
+      AppFile:
+        type: string
+        description: Name of Application File
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: greet
+        id: test_echo
+        run: | 
+          echo "Application file is: ${{ github.event.inputs.AppFile }}"
+          export APP_EMAIL=`/bin/grep "**Contact Email:**" "applications/${{ github.event.inputs.AppFile }}" | cut -d" " -f4`
+          echo "email_addr=$APP_EMAIL" >> $GITHUB_OUTPUT
+          echo email addr is $APP_EMAIL
+      - name: test_output
+        run: echo "the new output test shows the email_addr is ${{ steps.test_echo.outputs.email_addr }}"
+
+  call-parser:
+    uses: ./.github/workflows/am-big-parser.yml
+    with:
+      filename: "applications/${{ github.event.inputs.AppFile }}"
+    needs: build
+
+  echo-the-returned-fields:
+    runs-on: ubuntu-latest
+    needs: call-parser
+    steps:
+      - id: echo-output
+        run: |
+          echo "basename ${{ needs.call-parser.outputs.basename }} "
+          echo "project name ${{ needs.call-parser.outputs.project_name }} "
+          echo "contact name ${{ needs.call-parser.outputs.contact_name }}"
+          echo "team name ${{ needs.call-parser.outputs.team_name }}"
+          echo "app_email ${{ needs.call-parser.outputs.app_email }}"
+          echo "total cost ${{ needs.call-parser.outputs.total_cost }}"
+          echo "legal entity ${{ needs.call-parser.outputs.legal_entity }}"
+          echo "legal addr ${{ needs.call-parser.outputs.legal_addr }}"
+          echo "level ${{ needs.call-parser.outputs.level }}"
+          echo "eos_addr ${{ needs.call-parser.outputs.eos_addr }}"
+          echo "github_actor ${{ needs.call-parser.outputs.github_actor }}"
+          echo "pr_no ${{ needs.call-parser.outputs.pr_no }}"
+          echo "website ${{ needs.call-parser.outputs.website }}"
+          echo "open_source ${{ needs.call-parser.outputs.open_source }}"
+          echo "token_sale ${{ needs.call-parser.outputs.token_sale }}"
+  write-spreadsheet:
+    uses: ./.github/workflows/am-big-gsheet.yml
+    needs: call-parser
+    with:
+      project_name: ${{ needs.call-parser.outputs.project_name }}
+      contact_name: ${{ needs.call-parser.outputs.contact_name }}
+      team_name: ${{ needs.call-parser.outputs.team_name }}
+      app_email: ${{ needs.call-parser.outputs.app_email }}
+      total_cost: ${{ needs.call-parser.outputs.total_cost }}
+      legal_entity: ${{ needs.call-parser.outputs.legal_entity }}
+      legal_addr: ${{ needs.call-parser.outputs.legal_addr }}
+      level: ${{ needs.call-parser.outputs.level }}
+      eos_addr: ${{ needs.call-parser.outputs.eos_addr }}
+      github_actor: ${{ needs.call-parser.outputs.github_actor }}
+      pr_no: ${{ needs.call-parser.outputs.pr_no }}
+      website: ${{ needs.call-parser.outputs.website }}
+      open_source: ${{ needs.call-parser.outputs.open_source }}
+      token_sale: ${{ needs.call-parser.outputs.token_sale }}
+      basename: ${{ needs.call-parser.outputs.basename }}
+    secrets:
+      gsheet_private_key: ${{ secrets.GHSEET_API_KEY }}

.github/workflows/grant-committee-approved.yml

@@ -5,6 +5,7 @@
 # grant-committee-approved.yml
 #
 # Ted Cahall 31May2022
+# Updated to remove node12 warnings 22May2023
 
 name: Grant Committee Approved
 
@@ -28,7 +29,7 @@ jobs:
     steps:
       - name: Get application file name
         id: 'files'
-        uses: Ana06/get-changed-files@v2.0.0
+        uses: Ana06/get-changed-files@v2.2.0
         with:
           filter: 'applications/*.md'
 

.github/workflows/grant-fully-approved.yml

@@ -5,6 +5,7 @@
 # grant-fully-approved.yml
 #
 # Ted Cahall 28May2022
+# Updated to remove node12 warnings 22May2023 - Ana06/get-changed-files@v2.2.0
 
 name: Grant Fully Approved
 
@@ -28,7 +29,7 @@ jobs:
     steps:
       - name: Get application file name
         id: 'files'
-        uses: Ana06/get-changed-files@v2.0.0
+        uses: Ana06/get-changed-files@v2.2.0
         with:
           filter: 'applications/*.md'
 

.github/workflows/grant-translated.yaml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Get grant application file name
         id: 'files'
-        uses: Ana06/get-changed-files@v2.0.0
+        uses: Ana06/get-changed-files@v2.2.0
         with:
           filter: 'applications/*.md'
 
@@ -44,26 +44,27 @@ jobs:
       - name: assign the env from the email name
         id: grep_email
         run: |
-          export APP_EMAIL=`/bin/grep "**Contact Email:**" ${{ needs.get_filename.outputs.filename }} | cut -d" " -f4`
-          #echo "::set-env name=APP_EMAIL::$APP_EMAIL"
-          echo "::set-output name=email_addr::$APP_EMAIL"
-          export CNAME=`/bin/grep "**Contact Name:**" ${{ needs.get_filename.outputs.filename }} | cut -d" " -f4-8`
-          echo "::set-output name=contact_name::$CNAME"
-          export PNAME=`/bin/grep "**Project Name:**" ${{ needs.get_filename.outputs.filename }} | cut -d" " -f4-8`
-          echo "::set-output name=project_name::$PNAME"
-          export TNAME=`/bin/grep "**Team Name:**" ${{ needs.get_filename.outputs.filename }} | cut -d" " -f4-8`
-          echo "::set-output name=team_name::$TNAME"
-          export TCOST=`/bin/grep "**Total Costs:**" ${{ needs.get_filename.outputs.filename }} | cut -d" " -f4-8`
-          echo "::set-output name=total_cost::$TCOST"
+          export APP_EMAIL=`/bin/grep -F "**Contact Email:**" ${{ needs.get_filename.outputs.filename }} | tr -s " " | cut -d" " -f4`
+          echo "email_addr=$APP_EMAIL" >> $GITHUB_OUTPUT
+          # old way-> echo "::set-output name=email_addr::$APP_EMAIL"
+          export CNAME=`/bin/grep -F "**Contact Name:**" ${{ needs.get_filename.outputs.filename }} | tr -s " " | cut -d" " -f4-8`
+          echo "contact_name=$CNAME" >> $GITHUB_OUTPUT
+          export PNAME=`/bin/grep -F "**Project Name:**" ${{ needs.get_filename.outputs.filename }} | tr -s " " | cut -d" " -f4-8`
+          echo "project_name=$PNAME"  >> $GITHUB_OUTPUT
+          export TNAME=`/bin/grep -F "**Team Name:**" ${{ needs.get_filename.outputs.filename }} | tr -s " " | cut -d" " -f4-8`
+          echo "team_name=$TNAME" >> $GITHUB_OUTPUT
+          export TCOST=`/bin/grep -F "**Total Costs:**" ${{ needs.get_filename.outputs.filename }} | tr -s " " | cut -d" " -f4-8`
+          echo "total_cost=$TCOST" >> $GITHUB_OUTPUT
           echo ${{ github.actor }} ${{ github.event_name }} ${{ github.event.pull_request.head.repo.owner.login }}
+          #echo $APP_MAIL $CNAME $PNAME $TNAME $TCOST
 
   checklabel:
     needs: [get_filename, parse_app]
     if: github.event.label.name == 'Grant Translated'
     runs-on: ubuntu-latest
     steps:
       - id: 'update_worksheet'
-        uses: jroehl/gsheet.action@v1.2.0
+        uses: jroehl/gsheet.action@v2.0.1
         with:
           #spreadsheetId: 1FsNUKcfAJAorZGHpEzbRKLVYWbpZ_93Ts-R-JTpRK_A #This is the DummyTest sheet
           spreadsheetId: 1RdSK5Y_URnTSzg__fRHV51jwO90x4AUMy0ym0ytWwKA

.github/workflows/pr-received.yml

@@ -26,19 +26,25 @@ jobs:
     steps:
       - name: Get application file name
         id: 'files'
-        uses: Ana06/get-changed-files@v2.1.0
+        uses: Ana06/get-changed-files@v2.2.0
         with:
           filter: 'applications/*.md'
 
+  testfile:
+    uses: ./.github/workflows/ru-check-filename.yml
+    with:
+      filename: "${{ needs.get_filename.outputs.filename }}"
+    needs: get_filename
+
   call-parser:
     uses: ./.github/workflows/ru-big-parser.yml
     with:
       filename: "${{ needs.get_filename.outputs.filename }}"
-    needs: get_filename
+    needs: [get_filename, testfile]
 
   echo-the-returned-fields:
     runs-on: ubuntu-latest
-    needs: [get_filename, call-parser]
+    needs: call-parser
     steps:
       - id: echo-output
         run: |