Skip to content

Commit

Permalink
fix: conflicts agains develop
Browse files Browse the repository at this point in the history
  • Loading branch information
JeneaVranceanu committed Apr 1, 2024
2 parents bffba81 + 34cf1e8 commit 3f759ac
Show file tree
Hide file tree
Showing 360 changed files with 25,828 additions and 31,767 deletions.
4 changes: 4 additions & 0 deletions .codespellrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[codespell]
count = True
ignore-words-list = ans,deriver,inout,packag
skip = *.js,*WordLists.swift,.git,Carthage,.build,build
67 changes: 67 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Bug Report
description: File a bug report.
labels: ['bug']
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: textarea
id: bug-description
attributes:
label: What happened?
description: Please describe the bug.
placeholder: Description of the bug.
validations:
required: true
- type: textarea
id: steps-to-reproduce
attributes:
label: What are the steps to reproduce?
description: Please describe the steps to reproduce the bug.
placeholder: |
Step 1: ...
Step 2: ...
Step 3: ...
validations:
required: true
- type: textarea
id: expected-behavior
attributes:
label: What is the expected behavior?
description: Please describe the behavior you expect.
placeholder: I expect that...
validations:
required: true
- type: textarea
id: error-thrown
attributes:
label: What is the error thrown?
description: Please provide the exact error thrown.
placeholder: Web3Error.invalidData("Exact error message")
validations:
required: true
- type: textarea
id: source-path
attributes:
label: What's the stack trace said?
description: Please provide the exact source path.
placeholder: Sources/Core/Transaction/CodableTransaction.swift:129 func recoverPublicKey()
validations:
required: true
- type: textarea
id: os-version
attributes:
label: OS version
description: Please specify what platform and os version you are using?
placeholder: macOS 13.0.1 (22A400)
validations:
required: true
- type: textarea
id: lib-version
attributes:
label: Library version
description: Please specify what library version you are using?
placeholder: 3.0.6 or "ef06fbfc735ab687ebf89c937a9d1ffe6d81d37f" commit.
validations:
required: true
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/documentation-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Documentation Request
description: Suggest documentation you would like added
labels: ['documentation']
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this documentation request!
- type: textarea
id: area
attributes:
label: What piece of the framework are having the lack of docs?
description: Bring the link, either type, either method name that is having the lack of docs
placeholder: "`Sources/Core/EthereumABI.swift:ABIElementPropertiesProtocol` or `ABIElementPropertiesProtocol`"
validations:
required: true
- type: textarea
id: reason
attributes:
label: What bit of docs would you like to have?
description: A clear and concise description of why this documentation needs to be improved.
placeholder: There's a lack of docs that covers both the intent of this type and the way how it should be used within client code.
validations:
required: true
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Feature Request
description: Suggest an idea for this project
labels: ['enhancement']
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this feature request!
- type: textarea
id: problem
attributes:
label: What context is your feature request related to?
description: Short context name, please do not overcomplicate neither over fractionize it.
placeholder: Transaction pipeline enhancement, supported platform list extending, etc.
validations:
required: true
- type: textarea
id: solution
attributes:
label: What solution would you like?
description: A clear and concise description of what you want to happen.
placeholder: I would like that your lib has a magic "give me money" button, that provides me to just to build it, be uploaded to the AppStore and to get rich.
validations:
required: true
- type: textarea
id: context
attributes:
label: Any additional context?
description: If there's some specs either standard for such feature invented already here's the good place to provide those.
placeholder: Here's the pictures of house that i'd wanted to be able to bough after i've got rich and the my future cars list as well.
13 changes: 13 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## **Summary of Changes**

Fixes # _(if applicable - add the number of issue this PR addresses)_

## **Test Data or Screenshots**

###### _By submitting this pull request, you are confirming the following:_

- I have reviewed the [Contribution Guidelines](https://github.com/web3swift-team/web3swift/blob/develop/CONTRIBUTION.md).
- I have performed a self-review of my own code.
- I have updated my repository to match the `develop` branch.
- I have included test data or screenshots that prove my fix is effective or that my feature works.
- I have checked that all tests work and swiftlint is not throwing any errors/warnings.
77 changes: 0 additions & 77 deletions .github/workflows/ci.yml

This file was deleted.

61 changes: 61 additions & 0 deletions .github/workflows/macOS-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: "macOS 12"

on:
push:
branches:
- master
- develop
- hotfix
paths:
- Packag*.swift
- web3swift.podspec
- Cartfile
- Sources/**
- 'Tests/**'
- 'web3swift*/**'
- '.github/workflows/**'
pull_request:
branches:
- master
- develop
- unstable
# Temporary develop-X.Y.Z branches may be added and removed from here as we release new versions
- develop-4.0

env:
DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer

jobs:
spm:
name: Swift Package Manager 5.7
runs-on: macOS-12
concurrency:
group: spm-${{ github.run_id }}
cancel-in-progress: false
steps:
- uses: actions/checkout@v3
- name: Discover typos
run: |
pip3 install --upgrade pip
pip3 install codespell
codespell # See .codespellrc for args
- name: SwiftLint
run: |
# 1. Make all automated fixes that are possible
# 2. git diff to see what (if any) automated fixes were made
# 3. See https://github.com/realm/SwiftLint#xcode explains why the double run
swiftlint --fix --quiet && git diff && swiftlint --quiet
- name: Resolve dependencies
run: swift package resolve
- name: Build
run: swift build --build-tests
- name: Install ganache
run: npm install ganache --global
- name: Start ganache in background
run: ganache &
- name: Wait till ganache starts
run: sleep 1
- name: Run local tests
run: swift test --skip-build -c debug --filter localTests
- name: Run remote tests
run: swift test --skip-build -c debug --filter remoteTests
22 changes: 22 additions & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# https://pre-commit.com
# This GitHub Action assumes that the repo contains a valid .pre-commit-config.yaml file.
# Using pre-commit.ci is even better than using GitHub Actions for pre-commit.
name: pre-commit
on:
pull_request:
branches: [develop]
push:
branches: [develop]
workflow_dispatch:
jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.x
- run: pip install pre-commit
- run: pre-commit --version
- run: pre-commit install
- run: pre-commit run --all-files
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ xcuserdata/
*.moved-aside
*.xccheckout
*.xcscmblueprint
web3swift.xcodeproj/

## Obj-C/Swift specific
*.hmap
Expand All @@ -40,6 +41,7 @@ Package.pins
.build/
.swiftpm/**
*/.swiftpm/**
Package.resolved

# CocoaPods
#
Expand Down
22 changes: 22 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- id: check-case-conflict
- id: check-json
- id: mixed-line-ending
- id: no-commit-to-branch
args: [--branch, staging, --branch, main, --branch, master, --branch, develop-4.0, --branch, develop-upstream]
- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
hooks:
- id: codespell # See .codespellrc for args
# - repo: https://github.com/realm/SwiftLint # Too slow in pre-commit
# rev: 0.50.3
# hooks:
# - id: swiftlint
# args: [--fix, Sources, Tests]
Loading

0 comments on commit 3f759ac

Please sign in to comment.