Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into contract-init-rework
Browse files Browse the repository at this point in the history
# Conflicts:
#	FULL_HELP_DOCS.md
#	cmd/soroban-cli/src/commands/contract/init.rs
  • Loading branch information
Ifropc committed Oct 10, 2024
2 parents e294872 + a1ee944 commit 7d8b604
Show file tree
Hide file tree
Showing 111 changed files with 3,746 additions and 2,288 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/dependency-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ defaults:
shell: bash

jobs:
dependency-sanity-checker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: rustup update
- run: scripts/check-dependencies.bash
validate-rust-git-rev-deps:
runs-on: ubuntu-latest
steps:
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/full-help-docs.yml

This file was deleted.

11 changes: 10 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

complete:
if: always()
needs: [fmt, build-and-test, publish-dry-run]
needs: [fmt, check-generated-full-help-docs, build-and-test, publish-dry-run]
runs-on: ubuntu-latest
steps:
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
Expand All @@ -38,6 +38,15 @@ jobs:
- name: Check no diffs exist
run: git add -N . && git diff HEAD --exit-code

check-generated-full-help-docs:
runs-on: ubuntu-latest-16-cores
steps:
- uses: actions/checkout@v4
- uses: stellar/actions/rust-cache@main
- run: rustup update
- run: make generate-full-help-doc
- run: git add -N . && git diff HEAD --exit-code

build-and-test:
strategy:
fail-fast: false
Expand Down
Loading

0 comments on commit 7d8b604

Please sign in to comment.