Skip to content

Commit

Permalink
Merge branch 'bitcoin-core:master' into pt_br-translation
Browse files Browse the repository at this point in the history
  • Loading branch information
txuintxunfly committed Aug 1, 2024
2 parents e9a3d28 + 3285399 commit bbc490f
Show file tree
Hide file tree
Showing 573 changed files with 26,262 additions and 409 deletions.
46 changes: 41 additions & 5 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
container:
image: ruby:2.5.5
image: ruby:3.1.2

task:
name: website
env:
env:
JEKYLL_ENV: production
NOKOGIRI_USE_SYSTEM_LIBRARIES: true # speeds up installation of html-proofer
NOKOGIRI_USE_SYSTEM_LIBRARIES: true # speeds up installation of html-proofer
RUBYOPT: "-KU -E utf-8:utf-8"

task:
name: Bundler build

bootstrap_script: gem install bundler
bundler_cache:
folder: /usr/local/bundle
Expand All @@ -17,3 +18,38 @@ task:
populate_script: bundle install

build_and_test_script: make all

task:
name: debian only
container:
image: debian:bookworm
install_script:
- apt update
- >
apt install -y
curl
jekyll
make
ruby
ruby-jekyll-redirect-from
ruby-kramdown-parser-gfm
ruby-html-proofer
build_and_test_script:
- rm Gemfile.lock
- make all

task:
name: verify commits
only_if: $CIRRUS_BRANCH == 'master'
container:
image: debian:latest
install_script:
- apt update
- >
apt install -y
git
gnupg
verify_script:
- mapfile -t KEYS < contrib/verify-commits/trusted-keys
- gpg --keyserver hkps://keys.openpgp.org --recv-keys "${KEYS[@]}"
- ./contrib/verify-commits/verify-commits.sh
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.5
3.1.2
8 changes: 5 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ source 'https://rubygems.org'
## If you update the version here, also update it in .ruby-version, .cirrus.yml
## and README.md. Then push your branch and make sure Cirrus supports that
## version.
ruby '2.5.5'
ruby '3.1.2'

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

group :testing do
gem 'html-proofer'
gem 'html-proofer', "~> 3.19"
end
Loading

0 comments on commit bbc490f

Please sign in to comment.