Skip to content

Commit 1957127

Browse files
committed
Merge remote-tracking branch 'upstream/master' into bip-46
To fix the merge conflict caused by BIP 47 getting updated to final.
2 parents 8f0962a + 70d9b07 commit 1957127

File tree

153 files changed

+19372
-1776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+19372
-1776
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: GitHub Actions Check
2+
run-name: ${{ github.actor }} Checks 🚀
3+
on: [push, pull_request]
4+
jobs:
5+
Link-Format-Checks:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v4
9+
- run: scripts/link-format-chk.sh
10+
Build-Table-Checks:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- run: scripts/buildtable.pl >/tmp/table.mediawiki || exit 1
15+
Diff-Checks:
16+
name: "Diff Checks (fails until number assignment)"
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 2
22+
- run: scripts/diffcheck.sh

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
bip-0174/coinjoin-workflow.aux
2+
bip-0174/coinjoin-workflow.log
3+
bip-0174/coinjoin-workflow.pdf
4+
bip-0174/multisig-workflow.aux
5+
bip-0174/multisig-workflow.log
6+
bip-0174/multisig-workflow.pdf

.travis.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)