Merge pull request #1 from jmertic/main

Move to landscape2

.github/workflows/build.yml

@@ -1,64 +1,18 @@
-name: Update members
+name: Build Landscape from LFX
 
 on:
   workflow_dispatch:
-    # Uncomment to schedule builds
-    #  schedule: 
-    #- cron:  '0 1 * * *'
+  schedule:
+  - cron: "0 4 * * *"
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-24.04
     steps:
-      - name: Checkout landscape
-        uses: actions/checkout@v3
-        with:
-          path: landscape
-      - name: Checkout landscape-tools
-        uses: actions/checkout@v3
-        with:
-          repository: jmertic/landscape-tools
-          path: landscape-tools
-      - name: Set up Python 3.x
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r landscape-tools/requirements.txt
-      - name: Run build
-        working-directory: ./landscape
-        run: |
-          ../landscape-tools/landscapemembers.py
-      - name: Save missing.csv file
-        uses: actions/upload-artifact@v3
-        with:
-          name: missing-members 
-          path: ./landscape/missing.csv
-      - name: Checkout landscapeapp
-        uses: actions/checkout@v3
-        with:
-          repository: cncf/landscapeapp
-          path: landscapeapp
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-      - name: cleanup yml files
-        working-directory: ./landscapeapp
-        run: |
-          node tools/removePuppeteer
-          npm install
-          PROJECT_PATH=../landscape node tools/removeQuotes
-          PROJECT_PATH=../landscape node tools/pruneExtraEntries
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+      - uses: jmertic/lfx-landscape-tools@main
         with:
+          project_processing: skip
+        env:
           token: ${{ secrets.PAT }}
-          branch-suffix: timestamp
-          path: ./landscape
-          title: Update members
-          labels: automated-build
-          commit-message: Update members
+          repository: ${{ github.repository }}
+          ref: ${{ github.ref }}

.github/workflows/validate.yml

@@ -0,0 +1,26 @@
+name: Validate
+
+on:
+  merge_group:
+  pull_request:
+    branches:
+      - main
+      - master
+
+jobs:
+  validate-landscape:
+    runs-on: ubuntu-latest
+    name: "Validate landscape.yml file"
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cncf/landscape2-validate-action@v2
+        with:
+          target_kind: data
+          target_path: ./landscape.yml
+      - uses: pascalgn/[email protected]
+        if: success()
+        env:
+          GITHUB_TOKEN: "${{ secrets.PAT }}"
+          MERGE_LABELS: "automated-build"
+          MERGE_RETRY_SLEEP: 300000
+          MERGE_METHOD: "squash"

.gitignore

@@ -43,3 +43,19 @@ data.json
 preview.json
 lookup.json
 landscapeapp
+missing.csv
+landscape.sqlite
+githubapi.sqlite
+missing-projects.csv
+build/
+
+# data files used by scripts
+tooling/*.csv
+tooling/*.yml
+tooling/*.yaml
+tooling/*.txt
+tooling/*.json
+
+build/
+landscape.sqlite
+githubapi.sqlite

config.yml

@@ -0,0 +1,11 @@
+landscapeMemberClasses:
+   - name: Premier Membership
+     category: Premier
+   - name: General Membership
+     category: General
+   - name: Associate Membership
+     category: Associate
+   - name: Startup
+     category: Startup
+slug: ccc
+landscapeMemberCategory: Confidential Computing Consortium Member Company