From 0846bcd052a02f990b3958bbe7b102202a082a61 Mon Sep 17 00:00:00 2001
From: willcl-ark
Date: Mon, 4 Dec 2023 09:45:03 +0000
Subject: [PATCH 1/3] index: link first contribution page
---
entries/first-contribution.md | 2 +-
index.html | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/entries/first-contribution.md b/entries/first-contribution.md
index 1761a8d..1935efd 100644
--- a/entries/first-contribution.md
+++ b/entries/first-contribution.md
@@ -35,7 +35,7 @@ to Bitcoin Core but don't know what to work on or how to get started.
- If you're trying to find a particular file, learn about Bitcoin
Core's [architecture](/architecture.html).
- - If you encounter confusing code, esearch the [history of that
+ - If you encounter confusing code, research the [history of that
particular code](/past-changes.html).
- To contribute a change:
diff --git a/index.html b/index.html
index fdf1aa2..62a0b1c 100644
--- a/index.html
+++ b/index.html
@@ -44,6 +44,11 @@
review and learn as you go.
+
+
Squash a bug
The minimal information you need to fix a problem.
From dc9a38189dae444bbbea16d6945e98fb2cc655e5 Mon Sep 17 00:00:00 2001
From: willcl-ark
Date: Mon, 4 Dec 2023 09:51:46 +0000
Subject: [PATCH 2/3] remove extra build flow
---
.github/workflows/build-check.yml | 41 -------------------------------
1 file changed, 41 deletions(-)
delete mode 100644 .github/workflows/build-check.yml
diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
deleted file mode 100644
index 88ed72a..0000000
--- a/.github/workflows/build-check.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# see https://github.com/actions/starter-workflows/blob/main/pages/jekyll.yml for reference
-name: Build
-on:
- pull-request:
- branches: [main, master]
- # Allows you to run this workflow manually from the Actions tab
- workflow_dispatch:
-concurrency:
- group: github-pages
- cancel-in-progress: false
-jobs:
- build-jekyll:
- runs-on: ubuntu-latest
- environment:
- name: github-pages
- url: ${{ steps.deployment.outputs.page_url }}
- steps:
- - name: Checkout
- uses: actions/checkout@v4
- - name: Configure Pages
- id: pages
- uses: actions/configure-pages@v3
- - name: Install Ruby and Jekyll
- uses: ruby/setup-ruby@v1
- with:
- ruby-version: '3.2'
- bundler-cache: true
- cache-version: 0
- - name: Setup Node.JS 18
- uses: actions/setup-node@v4
- with:
- node-version: 18
- - name: Install mermaid-cli
- run: npm install -g @mermaid-js/mermaid-cli
- - name: Generate Site
- run: |
- bundle
- make all
- env:
- JEKYLL_ENV: production
- ADD_JEKYLL_ARGS: --baseurl "${{ steps.pages.outputs.base_path }}"
From 6e97419a6cfbfa2c578fdeea2216b985de1a9eae Mon Sep 17 00:00:00 2001
From: willcl-ark
Date: Mon, 4 Dec 2023 09:54:22 +0000
Subject: [PATCH 3/3] makefile: use bash shell so github actions work
---
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index aa92f85..e25ec02 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ production: clean all production-test
## https://github.com/bitcoinops/bitcoinops.github.io/pull/494#discussion_r546376335
export GIT_PAGER='_contrib/kill0'
JEKYLL_FLAGS = --future --drafts --unpublished --incremental
+## Needed for github actions to work properly
+SHELL=/bin/bash
clean:
bundle exec jekyll clean
@@ -61,5 +63,5 @@ pdf:
mv onboarding-to-bitcoin-core.pdf bin/
epub:
- asciidoctor -b epub3 -r asciidoctor-epub3 -r asciidoctor-diagram -o index.epub index_epub.adoc
+ bundle exec asciidoctor -b epub3 -r asciidoctor-epub3 -r asciidoctor-diagram -o index.epub index_epub.adoc
mv index.epub bin/onboarding-to-bitcoin-core.epub