Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/codacy/codacy-anal…
Browse files Browse the repository at this point in the history
…ysis-cli-action-4.3.0
  • Loading branch information
nebolsin committed Sep 22, 2023
2 parents 2dd82a3 + 260e8c5 commit 65d0e75
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 100 deletions.
52 changes: 12 additions & 40 deletions .github/dependabot.yml
Expand Up @@ -3,53 +3,25 @@
version: 2
updates:
- package-ecosystem: "github-actions"
# Check for updates to GitHub Actions every week
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
commit-message:
prefix: "ci"
include: "scope"
prefix: "chore(ci)"
- package-ecosystem: "bundler"
# Check for for ruby deps update daily
directory: "/"
schedule:
interval: "daily"
versioning-strategy: "increase-if-necessary"
commit-message:
prefix: "chore"
include: "scope"
- package-ecosystem: "bundler"
directory: "/base"
schedule:
interval: "daily"
commit-message:
prefix: "chore"
include: "scope"
allow:
- dependency-type: "direct"
labels:
- "dependencies"
- "stellar-base"
- package-ecosystem: "bundler"
directory: "/horizon"
schedule:
interval: "daily"
- dependency-type: "direct"
commit-message:
prefix: "chore"
include: "scope"
allow:
- dependency-type: "direct"
labels:
- "dependencies"
- "stellar-horizon"
- package-ecosystem: "bundler"
directory: "/sdk"
schedule:
interval: "daily"
commit-message:
prefix: "chore"
include: "scope"
allow:
- dependency-type: "direct"
labels:
- "dependencies"
- "stellar-sdk"
prefix: "chore(deps)"
prefix-development: "core(dev-deps)"
groups:
deps:
dependency-type: "production"
dev-deps:
dependency-type: "development"
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
ruby: ['3.2', '3.1', '3.0', '2.7', jruby, truffleruby, debug]
continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: rm Gemfile.lock
- name: Setup Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
Expand All @@ -31,7 +31,7 @@ jobs:
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
Expand All @@ -52,7 +52,7 @@ jobs:
if: success()
continue-on-error: true
- name: Upload code coverage data to CodeClimate
uses: paambaati/codeclimate-action@v4
uses: paambaati/codeclimate-action@v5
with:
coverageLocations: |
base/coverage/coverage.json:simplecov
Expand All @@ -70,7 +70,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
Expand All @@ -85,7 +85,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check markdown files for broken links
uses: justinbeckwith/linkinator-action@v1
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/security.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
language: [ 'ruby' ]
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
Expand All @@ -45,7 +45,7 @@ jobs:
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
image: returntocorp/semgrep
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Semgrep Scan
run: semgrep scan --config=auto --sarif --output=semgrep.sarif
env:
Expand All @@ -94,7 +94,7 @@ jobs:
if: (github.actor != 'dependabot[bot]')
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Run Snyk to check for vulnerabilities
uses: snyk/actions/ruby@master
continue-on-error: true
Expand All @@ -113,7 +113,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Analyze the licences with Fossa
uses: fossas/fossa-action@main
with:
Expand Down
46 changes: 25 additions & 21 deletions Gemfile.lock
Expand Up @@ -32,19 +32,20 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activemodel (7.0.6)
activesupport (= 7.0.6)
activesupport (7.0.6)
activemodel (7.0.8)
activesupport (= 7.0.8)
activesupport (7.0.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.4)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
awesome_print (1.9.2)
backports (3.24.1)
base32 (0.3.4)
base64 (0.1.1)
break (0.40.0)
bundler-audit (0.9.1)
bundler (>= 1.2.0, < 3)
Expand All @@ -57,7 +58,7 @@ GEM
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
docile (1.4.0)
excon (0.100.0)
excon (0.103.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -116,20 +117,20 @@ GEM
json (2.6.3)
json (2.6.3-java)
language_server-protocol (3.17.0.3)
lint_roller (1.0.0)
lint_roller (1.1.0)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
lumberjack (1.2.8)
method_source (1.0.0)
minitest (5.18.1)
minitest (5.20.0)
multipart-post (2.3.0)
nenv (0.3.0)
netrc (0.11.0)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
octokit (6.1.1)
octokit (7.1.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
parallel (1.23.0)
Expand All @@ -146,7 +147,7 @@ GEM
pry-doc (1.4.0)
pry (~> 0.11)
yard (~> 0.9.11)
public_suffix (5.0.1)
public_suffix (5.0.3)
racc (1.7.1)
racc (1.7.1-java)
rainbow (3.1.1)
Expand All @@ -157,7 +158,7 @@ GEM
rbnacl (7.1.1)
ffi
regexp_parser (2.8.1)
rexml (3.2.5)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
Expand All @@ -174,19 +175,21 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rubocop (1.52.1)
rubocop (1.56.3)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-performance (1.18.0)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-progressbar (1.13.0)
Expand All @@ -206,24 +209,25 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.29.0)
standard (1.31.1)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.52.0)
rubocop (~> 1.56.2)
standard-custom (~> 1.0.0)
standard-performance (~> 1.1.0)
standard-custom (1.0.1)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
standard-performance (1.1.0)
lint_roller (~> 1.0)
rubocop-performance (~> 1.18.0)
rubocop (~> 1.50)
standard-performance (1.2.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.0)
thor (1.2.2)
tomlrb (2.0.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
vcr (6.2.0)
webmock (3.18.1)
webmock (3.19.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
Expand Down
58 changes: 29 additions & 29 deletions base/lib/stellar-base.rb
Expand Up @@ -23,32 +23,32 @@

# extensions onto the generated files must be loaded manually, below

require_relative "./stellar/account"
require_relative "./stellar/account_flags"
require_relative "./stellar/amount"
require_relative "./stellar/asset"
require_relative "./stellar/claim_predicate"
require_relative "./stellar/key_pair"
require_relative "./stellar/ledger_key"
require_relative "./stellar/liquidity_pool"
require_relative "./stellar/networks"
require_relative "./stellar/operation"
require_relative "./stellar/path_payment_strict_receive_result"
require_relative "./stellar/price"
require_relative "./stellar/signer_key"
require_relative "./stellar/thresholds"
require_relative "./stellar/trust_line_flags"

require_relative "./stellar/concerns/transaction"
require_relative "./stellar/fee_bump_transaction"
require_relative "./stellar/transaction"
require_relative "./stellar/transaction_builder"
require_relative "./stellar/transaction_envelope"
require_relative "./stellar/transaction_v0"

require_relative "./stellar/util/strkey"
require_relative "./stellar/convert"

require_relative "./stellar/dsl"

require_relative "./stellar/compat"
require_relative "stellar/account"
require_relative "stellar/account_flags"
require_relative "stellar/amount"
require_relative "stellar/asset"
require_relative "stellar/claim_predicate"
require_relative "stellar/key_pair"
require_relative "stellar/ledger_key"
require_relative "stellar/liquidity_pool"
require_relative "stellar/networks"
require_relative "stellar/operation"
require_relative "stellar/path_payment_strict_receive_result"
require_relative "stellar/price"
require_relative "stellar/signer_key"
require_relative "stellar/thresholds"
require_relative "stellar/trust_line_flags"

require_relative "stellar/concerns/transaction"
require_relative "stellar/fee_bump_transaction"
require_relative "stellar/transaction"
require_relative "stellar/transaction_builder"
require_relative "stellar/transaction_envelope"
require_relative "stellar/transaction_v0"

require_relative "stellar/util/strkey"
require_relative "stellar/convert"

require_relative "stellar/dsl"

require_relative "stellar/compat"

0 comments on commit 65d0e75

Please sign in to comment.