Skip to content

Commit 1cc169a

Browse files
committed
Merge branch 'main' into dependabot/cargo/google-cloud-auth-0.21.0
* main: chore: Updating lock file (#383) chore: Update msrv to 1.86 (#384) chore: Add codeql.yml (#382) fix: Semgrep send metrics value (#381) chore: Adding support for Fuse, Abstract and Sophon (#370) fix: Implement stellar sequence sync and tx reset (#367) feat: Update Stellar network config and docs (#380) chore: Updating lock file (#379) fix: Inheritance validation (#374) chore: Add osv-scanner.toml file to ignore some false positives (#376) chore(deps): bump tj-actions/changed-files from 115870536a85eaf050e369291c7895748ff12aea to e8772ff27de71367c2771ef3e8b5b2075b3f8282 (#328) chore(deps): bump peter-evans/dockerhub-description from d2ae8d7d33235a2c36eca5780f07651ab62f54e4 to 940963a8741595ec313b776ff5b2944075a02357 (#330) feat: Add status_reason field to transaction responses (#369) feat: Enhance Stellar tx handling with fee updates (#368) chore(deps): bump github/codeql-action from 3.28.19 to 3.29.2 (#331) chore(deps): bump redis from 0.32.2 to 0.32.3 (#333) chore(deps): bump reqwest from 0.12.20 to 0.12.21 (#334) chore(deps): bump form-data from 4.0.3 to 4.0.4 in /plugins in the npm_and_yarn group across 1 directory (#377)
2 parents d5bab3f + 5b27da8 commit 1cc169a

34 files changed

Lines changed: 2286 additions & 349 deletions

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4242
- name: Get changed files
4343
id: changed-files-yaml
44-
uses: tj-actions/changed-files@115870536a85eaf050e369291c7895748ff12aea # v46.0.4
44+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
4545
with:
4646
files_yaml: |
4747
code:
@@ -147,7 +147,7 @@ jobs:
147147
path: clippy-results.sarif
148148
retention-days: 1
149149
- name: Upload
150-
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
150+
uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
151151
with:
152152
sarif_file: clippy-results.sarif
153153
wait-for-processing: true
@@ -208,7 +208,7 @@ jobs:
208208
RUSTFLAGS: -Cinstrument-coverage
209209
RUST_TEST_THREADS: 1
210210
run: cargo hack llvm-cov --locked --lib --ignore-filename-regex "(.*/relayer_docs\.rs$|src/repositories/.*/.*_redis\.rs$)" --lcov --output-path unit-lcov.info
211-
211+
212212
# Integration tests coverage
213213
- name: Run Integration Tests and Generate Coverage Report
214214
env:

.github/workflows/codeql.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: "CodeQL Advanced"
2+
3+
on:
4+
push:
5+
branches: ["main"]
6+
pull_request:
7+
branches: ["main"]
8+
schedule:
9+
- cron: "25 21 * * 1"
10+
11+
jobs:
12+
analyze:
13+
name: Analyze (${{ matrix.language }})
14+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
15+
permissions:
16+
# required for all workflows
17+
security-events: write
18+
19+
# required to fetch internal or private CodeQL packs
20+
packages: read
21+
22+
# only required for workflows in private repositories
23+
# actions: read
24+
# contents: read
25+
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
include:
30+
- language: actions
31+
build-mode: none
32+
- language: rust
33+
build-mode: none
34+
steps:
35+
- name: Checkout repository
36+
uses: actions/checkout@v@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.5.4
37+
38+
# Initializes the CodeQL tools for scanning.
39+
- name: Initialize CodeQL
40+
uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
41+
with:
42+
languages: ${{ matrix.language }}
43+
build-mode: ${{ matrix.build-mode }}
44+
45+
- name: Perform CodeQL Analysis
46+
uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
47+
48+
with:
49+
category: "/language:${{matrix.language}}"

.github/workflows/release-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
push-to-registry: false
8585
github-token: ${{ steps.gh-app-token.outputs.token }}
8686
- name: Docker Hub Description
87-
uses: peter-evans/dockerhub-description@d2ae8d7d33235a2c36eca5780f07651ab62f54e4
87+
uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4.0.2
8888
with:
8989
username: ${{ vars.DOCKERHUB_USERNAME }}
9090
password: ${{ secrets.DOCKERHUB_PAT }}

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ jobs:
5353
path: results.sarif
5454
retention-days: 5
5555
- name: Upload SARIF to GitHub Code Scanning
56-
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
56+
uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
5757
with:
5858
sarif_file: results.sarif

.github/workflows/semgrep.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1+
---
12
name: Semgrep
2-
33
on:
44
# Scan changed files in PRs (diff-aware scanning):
55
pull_request_target: {}
66
# Scan on-demand through GitHub Actions interface:
77
workflow_dispatch: {}
88
# Scan mainline branches and report all findings:
99
push:
10-
branches: ["main"]
10+
branches:
11+
- main
1112
# Schedule the CI job (this method uses cron syntax):
1213
schedule:
13-
- cron: '15 11 * * *' # Sets Semgrep to scan every day at 11:15 UTC.
14-
14+
- cron: 15 11 * * * # Sets Semgrep to scan every day at 11:15 UTC.
1515
jobs:
1616
semgrep:
1717
name: semgrep/ci
@@ -20,13 +20,11 @@ jobs:
2020
security-events: write
2121
# contents: read
2222
# actions: read
23-
2423
container:
2524
image: semgrep/semgrep@sha256:85f9de554201cc891c470774bb93a7f4faf41ea198ddccc34a855b53f7a51443 # v1.127.1
2625

2726
# Skip any PR created by dependabot to avoid permission issues:
2827
if: (github.actor != 'dependabot[bot]')
29-
3028
steps:
3129
- name: Harden Runner
3230
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -42,9 +40,8 @@ jobs:
4240
# Do not check for new version
4341
SEMGREP_ENABLE_VERSION_CHECK: 0
4442
# No metrics
45-
SEMGREP_SEND_METRICS: off
43+
SEMGREP_SEND_METRICS: 'off'
4644
- name: Upload SARIF file for GitHub Advanced Security Dashboard
47-
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
45+
uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
4846
with:
4947
sarif_file: semgrep.sarif
50-

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ Note: if your pull request isn't getting enough attention, you can contact us on
346346
347347
## Coding Standards
348348
349-
- Use **Rust 2021 edition**, version `1.85` or later.
349+
- Use **Rust 2021 edition**, version `1.86` or later.
350350
- Follow the [Rust API Guidelines](https://rust-lang.github.io/api-guidelines/).
351351
- Run pre-commit hooks on your code to ensure code quality.
352352

0 commit comments

Comments
 (0)