From 1325e9477952080fa09b0806583a1218680b0852 Mon Sep 17 00:00:00 2001 From: niclaz <83479948+niclaz@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:48:02 +0200 Subject: [PATCH 1/4] Improved README.md --- README.md | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8c8d84d..710bb7a 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,34 @@ # Web3Privacy Now Data [![Build and Deploy](https://github.com/web3privacy/data/actions/workflows/deploy.yml/badge.svg)](https://github.com/web3privacy/data/actions/workflows/deploy.yml) +[![Synchronize data](https://github.com/web3privacy/data/actions/workflows/sync.yml/badge.svg)](https://github.com/web3privacy/data/actions/workflows/sync.yml) -This is a repository with structured dataset with basic informations about the [Web3Privacy Now](https://web3privacy.info/) initiative. +This repository is the structured dataset with basic informations about the [Web3Privacy Now](https://web3privacy.info/) initiative. You can find it here: -- Official links -- List of team members -- List of projects -- List of events +- [Web3PrivacyNow Official links and team members](https://github.com/web3privacy/data/blob/main/src/index.yaml) +- [Web3PrivacyNow Manifesto](https://github.com/web3privacy/data/blob/main/src/W3PN%20Manifesto.png) +- [List of projects](https://github.com/web3privacy/data/blob/main/src/projects/index.yaml) +- [List of events](https://github.com/web3privacy/data/blob/main/src/events/index.yaml) +- [Database of people](https://github.com/web3privacy/data/tree/main/src/people) +- [List of research](https://github.com/web3privacy/data/blob/main/src/research/index.yaml) -## Deployment +## Deployment (JSON) * https://data.web3privacy.info/ +## Downstream + +* Once deployed to data.web3privacy.info the data is used in the deployment of the main project website [web3privacy.info](https://web3privacy.info/) - [see relevant repository](https://github.com/web3privacy/web) + ## Quick links | Collection | Source | Links | | --- | --- | --- | -| Core file (links, team) | [`src/index.yaml`](src/index.yaml) | [Edit](https://github.com/web3privacy/data/edit/main/src/index.yaml) | +| Data Schema | [`schema/index.yaml`](schema/index.yaml) | [Edit](https://github.com/web3privacy/data/edit/main/schema/index.yaml) | +| Core file | [`src/index.yaml`](src/index.yaml) | [Edit](https://github.com/web3privacy/data/edit/main/src/index.yaml) | | Projects | [`src/projects/index.yaml`](src/projects/index.yaml) | [Edit](https://github.com/web3privacy/data/edit/main/src/projects/index.yaml) | | Events | [`src/events/index.yaml`](src/events/index.yaml) | [Edit](https://github.com/web3privacy/data/edit/main/src/events/index.yaml) | +| Research | [`src/research/index.yaml`](src/research/index.yaml) | [Edit](https://github.com/web3privacy/data/edit/main/src/research/index.yaml) | +| People | [`src/people`](src/people/) | [Edit](https://github.com/web3privacy/data/edit/main/src/people/) | + From 3cc949ec5ff48024a23ae6f789f88c9d7a6ec281 Mon Sep 17 00:00:00 2001 From: niclaz <83479948+niclaz@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:47:10 +0200 Subject: [PATCH 2/4] Fixing actions/upload-artifact entry in deploy.yml --- .github/workflows/deploy.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b0c2595..93e57d2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,6 +14,7 @@ on: # Allow this job to clone the repo and create a page deployment permissions: + actions: read contents: read pages: write id-token: write @@ -48,15 +49,19 @@ jobs: - name: Upload Pages artifact uses: actions/upload-artifact@v4 with: - path: ./dist - + name: W3PN-artifact + path: ~/pre-deploy-artifact-upload/ + if-no-files-found: warn + retention-days: 80 + overwrite: true + deploy: needs: build runs-on: ubuntu-latest environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} - steps: + steps: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4 From d79b2be2574862622865243af7db06d801469296 Mon Sep 17 00:00:00 2001 From: niclaz <83479948+niclaz@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:45:34 +0200 Subject: [PATCH 3/4] removed upload-artifacts from deploy.yml --- .github/workflows/deploy.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 93e57d2..3563442 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -45,15 +45,6 @@ jobs: - name: Add custom domain run: "touch dist/CNAME && echo \"data.web3privacy.info\" >> dist/CNAME" - - - name: Upload Pages artifact - uses: actions/upload-artifact@v4 - with: - name: W3PN-artifact - path: ~/pre-deploy-artifact-upload/ - if-no-files-found: warn - retention-days: 80 - overwrite: true deploy: needs: build From ea7c52d136cc0bfd3088e2b68c179c4c48b8c1d9 Mon Sep 17 00:00:00 2001 From: niclaz <83479948+niclaz@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:00:15 +0200 Subject: [PATCH 4/4] fixed typo tab in deploy.yaml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3563442..c645de8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -52,7 +52,7 @@ jobs: environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} - steps: + steps: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4