Commit Graph

3956 Commits

Author SHA1 Message Date
github-actions fe324f8534 Commit from GitHub Actions (Deploy Rendered Site) 2025-05-22 11:20:08 +00:00
github_actions 5f71eaf2e8 Auto-deploy: merging "main" branch 2025-05-22 11:08:59 +00:00
Daira-Emma Hopwood 1e7811f998
Merge pull request #1032 from daira/pdf-temp-fix
Temporarily make PDF rendering unconditional
2025-05-22 12:08:32 +01:00
Daira-Emma Hopwood 1cafe205b7 Temporarily make PDF rendering unconditional.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2025-05-22 11:52:29 +01:00
github-actions f3ce59f875 Commit from GitHub Actions (Deploy Rendered Site) 2025-05-22 10:19:22 +00:00
github_actions a752d2037b Auto-deploy: merging "main" branch 2025-05-22 10:15:41 +00:00
Daira-Emma Hopwood b2a65fa6f1
Merge pull request #1031 from zcash/resolve_gitignore_conflicts
Avoid conflict in .gitignore for `publish` branch merge
2025-05-22 11:15:04 +01:00
Kris Nuttycombe f5cb5ea9aa
Merge pull request #1024 from nuttycom/remove_obsolete_drafts
Remove obsolete drafts
2025-05-21 09:19:41 -06:00
Kris Nuttycombe 19a6acb156 Avoid conflict in .gitignore for `publish` branch merge 2025-05-21 08:47:19 -06:00
Kris Nuttycombe 51804354f3
Merge pull request #1027 from daira/fix-make-pdfs
Only render protocol spec PDFs if anything under `protocol/` has changed
2025-05-21 08:37:30 -06:00
Daira-Emma Hopwood 4be97f23f3 Use `fetch-depth: 3` in `render.yml`.
Verify non-existence of checked-in `base_ref`.
Fix the method of obtaining `base_ref`.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2025-05-21 00:54:09 +01:00
Daira-Emma Hopwood 3ed9d93081 Make sure that repo is added as a safe directory when using Docker.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2025-05-20 23:39:56 +01:00
Daira-Emma Hopwood 0a359f78b3 Only make PDFs if anything under `protocol/` has changed.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2025-05-20 23:27:55 +01:00
Daira-Emma Hopwood 0618014ec7 Remove obsolete targets from Makefiles.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2025-05-20 23:27:55 +01:00
github-actions 4f2fbee6be Commit from GitHub Actions (Deploy Rendered Site) 2025-05-20 22:11:53 +00:00
Kris Nuttycombe 943d5c3c2c Remove withdrawn and obsolete draft ZIPs. 2025-05-20 16:01:55 -06:00
github_actions ab7f63be7d Auto-deploy: merging "main" branch 2025-05-20 22:00:34 +00:00
Kris Nuttycombe 9dd3b2cefc
Merge pull request #1026 from daira/fix-readme
Add ZIP [draft]s for NU6.1 to README and fix links
2025-05-20 15:59:53 -06:00
github-actions cc67e7f1aa Commit from GitHub Actions (Deploy Rendered Site) 2025-05-20 21:34:44 +00:00
Daira-Emma Hopwood d9df9fa382 Add ZIP [draft]s for NU6.1 to README and fix links.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2025-05-20 22:27:51 +01:00
github_actions b00b41dd8f Auto-deploy: merging "main" branch 2025-05-20 21:23:32 +00:00
github-actions b5cbcc1c6f Commit from GitHub Actions (Deploy Rendered Site) 2025-05-20 21:22:54 +00:00
Kris Nuttycombe 9e647aa9cd
Merge pull request #987 from zcash/v6-tx-format-and-sighash
[ZIP 230, ZIP 246] v6 transaction format and sighash
2025-05-20 15:11:49 -06:00
github_actions ef7adb792d Auto-deploy: merging "main" branch 2025-05-20 21:11:44 +00:00
Kris Nuttycombe 2620e7d2b1
Merge pull request #1029 from nuttycom/mark_drafts_obsolete
Mark as obsolete the drafts that were rejected in the 2025-05 polling.
2025-05-20 15:11:01 -06:00
github-actions 5b2c62dd6b Commit from GitHub Actions (Deploy Rendered Site) 2025-05-20 19:41:32 +00:00
github_actions 81e8a8d4b4 Auto-deploy: merging "main" branch 2025-05-20 19:29:49 +00:00
Daira-Emma Hopwood 1569abde23
Merge pull request #1028 from zcash/dependabot/github_actions/actions/checkout-4.2.2
Bump actions/checkout from 4.1.7 to 4.2.2
2025-05-20 20:29:23 +01:00
dependabot[bot] cfd8a55a6f
Bump actions/checkout from 4.1.7 to 4.2.2
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.7...v4.2.2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 4.2.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-16 15:37:40 +00:00
Jack Grigg 936571a95f Merge branch 'main' into v6-tx-format-and-sighash 2025-05-15 22:48:09 +00:00
Kris Nuttycombe c00c77c01a Mark as obsolete the drafts that were rejected in the 2025-05 polling.
See https://forum.zcashcommunity.com/t/may-2025-polling-results-megathread/51152/1
for details as to the polling that was performed and the outcome of
those polls.
2025-05-15 14:30:45 -06:00
github-actions 330b0f52bd Commit from GitHub Actions (Deploy Rendered Site) 2025-05-15 20:20:16 +00:00
github_actions 4c96d6eafa Auto-deploy: merging "main" branch 2025-05-15 20:09:03 +00:00
Daira-Emma Hopwood 6a3b169833
Merge pull request #1012 from daira/zip-nu6.1
Move NU7 deployment to a draft, and NU6.1 to ZIP 255
2025-05-15 21:08:38 +01:00
github-actions cbdbc52ca7 Commit from GitHub Actions (Deploy Rendered Site) 2025-05-15 16:11:26 +00:00
github_actions 300b3b0d69 Auto-deploy: merging "main" branch 2025-05-15 15:59:43 +00:00
github-actions ea7f1f4c21 Commit from GitHub Actions (Deploy Rendered Site) 2025-05-15 15:58:53 +00:00
Kris Nuttycombe 4704a75359
Merge pull request #973 from daira/zip-315-update
Updates to ZIP 315
2025-05-15 09:51:43 -06:00
github_actions 5849138398 Auto-deploy: merging "main" branch 2025-05-15 15:47:51 +00:00
Kris Nuttycombe 5091c996a6
Merge pull request #997 from jackgavigan/patch-3
Create draft-jackgavigan-community-governed-funding.md
2025-05-15 09:47:30 -06:00
Kris Nuttycombe eeab1dbde3
Merge pull request #998 from jackgavigan/patch-4
Create draft-jackgavigan-pure-zcap-funding.md
2025-05-15 09:47:14 -06:00
github-actions 819c948786 Commit from GitHub Actions (Deploy Rendered Site) 2025-05-15 15:45:01 +00:00
Daira-Emma Hopwood 5b512d71d0 Move NU7 deployment to ZIP 255, and change ZIP 254 to specify NU6.1 deployment.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2025-05-15 16:44:45 +01:00
github_actions 9650dbdb19 Auto-deploy: merging "main" branch 2025-05-15 15:33:40 +00:00
Kris Nuttycombe c302b627ad
Merge pull request #1017 from zcash/fix-render-site
Fix GitHub Pages rendering in CI
2025-05-15 09:33:17 -06:00
Kris Nuttycombe d53bc5a634 Verify nonexistence of `rendered` directory in CI 2025-05-15 09:12:02 -06:00
Kris Nuttycombe c6d5c04c73
Merge pull request #1019 from nuttycom/test_readme_changes
Fix broken link in README
2025-05-15 08:56:46 -06:00
Kris Nuttycombe 0d0b5567c7 Fix broken link in README 2025-05-15 08:55:47 -06:00
Kris Nuttycombe adc04f1cc1 Merge branch 'fix-render-site' into publish
This merge commit restores the `rendered` files such that the deletion
never appears on the `publish` branch. This provides continuity for the
history of the renderings, while allowing their removal in `main`.
2025-05-15 06:52:49 -06:00
Kris Nuttycombe 1a2a88d89c Remove `rendered/` directory from main; this will now exist only on the `publish` branch. 2025-05-15 06:48:46 -06:00