Skip to content

Commit bbc490f

Browse files
authored
Merge branch 'bitcoin-core:master' into pt_br-translation
2 parents e9a3d28 + 3285399 commit bbc490f

File tree

573 files changed

+26262
-409
lines changed

Some content is hidden

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

573 files changed

+26262
-409
lines changed

.cirrus.yml

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
container:
2-
image: ruby:2.5.5
2+
image: ruby:3.1.2
33

4-
task:
5-
name: website
6-
env:
4+
env:
75
JEKYLL_ENV: production
8-
NOKOGIRI_USE_SYSTEM_LIBRARIES: true # speeds up installation of html-proofer
6+
NOKOGIRI_USE_SYSTEM_LIBRARIES: true # speeds up installation of html-proofer
97
RUBYOPT: "-KU -E utf-8:utf-8"
108

9+
task:
10+
name: Bundler build
11+
1112
bootstrap_script: gem install bundler
1213
bundler_cache:
1314
folder: /usr/local/bundle
@@ -17,3 +18,38 @@ task:
1718
populate_script: bundle install
1819

1920
build_and_test_script: make all
21+
22+
task:
23+
name: debian only
24+
container:
25+
image: debian:bookworm
26+
install_script:
27+
- apt update
28+
- >
29+
apt install -y
30+
curl
31+
jekyll
32+
make
33+
ruby
34+
ruby-jekyll-redirect-from
35+
ruby-kramdown-parser-gfm
36+
ruby-html-proofer
37+
build_and_test_script:
38+
- rm Gemfile.lock
39+
- make all
40+
41+
task:
42+
name: verify commits
43+
only_if: $CIRRUS_BRANCH == 'master'
44+
container:
45+
image: debian:latest
46+
install_script:
47+
- apt update
48+
- >
49+
apt install -y
50+
git
51+
gnupg
52+
verify_script:
53+
- mapfile -t KEYS < contrib/verify-commits/trusted-keys
54+
- gpg --keyserver hkps://keys.openpgp.org --recv-keys "${KEYS[@]}"
55+
- ./contrib/verify-commits/verify-commits.sh

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.5
1+
3.1.2

Gemfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ source 'https://rubygems.org'
44
## If you update the version here, also update it in .ruby-version, .cirrus.yml
55
## and README.md. Then push your branch and make sure Cirrus supports that
66
## version.
7-
ruby '2.5.5'
7+
ruby '3.1.2'
88

99
## If you add a new Gem below, run `bundle install` to install it.
1010
group :development do
11-
gem 'github-pages'
11+
gem 'jekyll'
12+
gem 'jekyll-redirect-from'
13+
gem 'kramdown-parser-gfm'
1214
end
1315

1416
group :testing do
15-
gem 'html-proofer'
17+
gem 'html-proofer', "~> 3.19"
1618
end

0 commit comments

Comments
 (0)