Merge pull request #2 from metagov/main

Merge main changes

.github/workflows/daoip5-update.yaml

@@ -21,23 +21,33 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
+          pip install -r daoip-5/scripts/requirements.txt
 
       - name: Generate JSON files
+        id: generate_files
         run: |
           # Detecting the updated/added folder in the funders directory
-          FOLDER_PATH=$(git diff --name-only HEAD^ HEAD | grep '^data/funders' | head -1 | xargs dirname)
+          FOLDER_PATH=$(git diff --name-only HEAD^ HEAD | grep '^data/funders' | head -1 | xargs dirname || true)
+          if [ -z "$FOLDER_PATH" ]; then
+            echo "No changes detected in funders directory. Exiting."
+            exit 0
+          fi
           # Running the main.py script with the detected path
           python3 daoip-5/scripts/main.py --path "./$FOLDER_PATH"
 
-      - name: Commit generated files
+      - name: Check for changes and commit
         run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Actions"
-          git add daoip-5/json
-          git commit -m "Auto-generated files for new/updated folder"
+          if [ -n "$(git status --porcelain)" ]; then
+            git config --local user.email "[email protected]"
+            git config --local user.name "GitHub Actions"
+            git add daoip-5/json
+            git commit -m "Auto-generated files for new/updated folder"
+          else
+            echo "No changes to commit."
+            exit 0
 
       - name: Push changes and create PR
+        if: success() && steps.generate_files.outputs.FOLDER_PATH != ''
         uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Auto-generated DAOIP-5 files for new/updated folder

daoip-5/json/optimism/grants_pool.json

@@ -170,6 +170,27 @@
             "email": "[email protected]",
             "image": "https://optimism.org/images/{'name': 'retrofunding4'}.png",
             "coverImage": "https://optimism.org/images/{'name': 'retrofunding4'}_cover.png"
+        },
+        {
+            "type": "GrantPool",
+            "id": {
+                "name": "retrofunding5"
+            },
+            "name": {
+                "name": "retrofunding5"
+            },
+            "description": "Grants pool for {'name': 'retrofunding5'}.",
+            "isOpen": false,
+            "applicationsURI": "https://optimism.org/applications/{'name': 'retrofunding5'}_example.json",
+            "governanceURI": "https://optimism.org/governance/{'name': 'retrofunding5'}_example.md",
+            "attestationIssuersURI": "https://optimism.org/attestations/{'name': 'retrofunding5'}_example.json",
+            "requiredCredentials": [
+                "DAO Attestation",
+                "KYC"
+            ],
+            "email": "[email protected]",
+            "image": "https://optimism.org/images/{'name': 'retrofunding5'}.png",
+            "coverImage": "https://optimism.org/images/{'name': 'retrofunding5'}_cover.png"
         }
     ]
 }

daoip-5/json/optimism/grants_season_1_applications_uri.json

@@ -404,7 +404,7 @@
                     "grantPoolId": "grants_season_1",
                     "grantPoolName": "grants_season_1",
                     "projectsURI": "https://gov.optimism.io/t/gf-phase-0-proposal-lyra-finance/202/22",
-                    "projectId": "lyra-finance",
+                    "projectId": "derivexyz",
                     "projectName": "Lyra V1",
                     "createdAt": "2022-07-01T00:00:00Z",
                     "contentURI": "https://gov.optimism.io/t/gf-phase-0-proposal-lyra-finance/202/22",

daoip-5/json/optimism/grants_season_4_applications_uri.json

@@ -910,7 +910,7 @@
                     "grantPoolId": "grants_season_4",
                     "grantPoolName": "grants_season_4",
                     "projectsURI": "https://app.charmverse.io/op-grants/page-8973550421901375",
-                    "projectId": "lyra-finance",
+                    "projectId": "derivexyz",
                     "projectName": "LYRA V2",
                     "createdAt": "2023-09-01T00:00:00Z",
                     "contentURI": "https://app.charmverse.io/op-grants/page-8973550421901375",