Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add trunk #326

Merged
merged 6 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "Kakarot-ef-tests",
"image": "mcr.microsoft.com/devcontainers/base:jammy",
"features": {
"ghcr.io/lee-orr/rusty-dev-containers/cargo-nextest:0": {}
},
"postCreateCommand": "apt update && apt install -y clang",
"remoteUser": "root"
}
{
"name": "Kakarot-ef-tests",
"image": "mcr.microsoft.com/devcontainers/base:jammy",
"features": {
"ghcr.io/lee-orr/rusty-dev-containers/cargo-nextest:0": {}
},
"postCreateCommand": "apt update && apt install -y clang",
"remoteUser": "root"
}
31 changes: 17 additions & 14 deletions .github/ISSUE_TEMPLATE/01_BUG_REPORT.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,40 @@
---
name: Bug Report
about: Create a report to help Kakarot to improve
title: 'bug: '
labels: 'bug'
assignees: ''
title: "bug: "
labels: "bug"
assignees: ""
---

# Bug Report
## Bug Report

**Kakarot version:**
### Kakarot version

<!-- Please specify commit or tag version. -->

**Current behavior:**
### Current behavior

<!-- Describe how the bug manifests. -->

**Expected behavior:**
### Expected behavior

<!-- Describe what the behavior would be without the bug. -->

**Steps to reproduce:**
### Steps to reproduce

<!-- Please explain the steps required to duplicate the issue, especially if you are able to provide a sample application. -->
<!-- Please explain the steps required to duplicate the issue,
especially if you are able to provide a sample application. -->

**Related code:**
### Related code

<!-- If you are able to illustrate the bug or feature request with an example, please provide it here. -->
<!-- If you are able to illustrate the bug or feature request with an example,
please provide it here. -->

```
```text
insert short code snippets here
```

**Other information:**
### Other information

<!-- List any other information that is relevant to your issue. Related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
<!-- List any other information that is relevant to your issue. Related issues,
suggestions on how to fix, Stack Overflow links, forum links, etc. -->
36 changes: 21 additions & 15 deletions .github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
---
name: Feature Request
about: Suggest an idea for this project
title: 'feat: '
labels: 'enhancement'
assignees: ''
title: "feat: "
labels: "enhancement"
assignees: ""
---

# Feature Request
## Feature Request

**Describe the Feature Request**
### Describe the Feature Request

<!-- A clear and concise description of what the feature request is. Please include if your feature request is related to a problem. -->
<!-- A clear and concise description of what the feature request is.
Please include if your feature request is related to a problem. -->

**Describe Preferred Solution**
### Describe Preferred Solution

<!-- A clear and concise description of what you want to happen. -->

**Describe Alternatives**
### Describe Alternatives

<!-- A clear and concise description of any alternative solutions or features you've considered. -->
<!-- A clear and concise description of any alternative solutions or
features you've considered. -->

**Related Code**
### Related Code

<!-- If you are able to illustrate the bug or feature request with an example, please provide it here. -->
<!-- If you are able to illustrate the bug or feature request with an
example, please provide it here. -->

**Additional Context**
### Additional Context

<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to add, use case, Stack Overflow links, forum links, screenshots, OS if applicable, etc. -->
<!-- List any other information that is relevant to your issue.
Stack traces, related issues, suggestions on how to add, use case,
Stack Overflow links, forum links, screenshots, OS if applicable, etc. -->

**If the feature request is approved, would you be willing to submit a PR?** Yes
/ No _(Help can be provided if you need assistance submitting a PR)_
### If the feature request is approved, would you be willing to submit a PR?

Yes / No _(Help can be provided if you need assistance submitting a PR)_
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/03_CODEBASE_IMPROVEMENT.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Codebase improvement
about:
Provide your feedback for the existing codebase. Suggest a better solution
for algorithms, development tools, etc.
title: 'dev: '
labels: 'enhancement'
assignees: ''
Provide your feedback for the existing codebase. Suggest a better solution for
algorithms, development tools, etc.
title: "dev: "
labels: "enhancement"
assignees: ""
---
31 changes: 16 additions & 15 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
# Pull Request type

<!--- Please provide a general summary of your changes in the title above -->

Time spent on this PR:

Resolves: #<Issue number>

# Pull Request type
Resolves: #{Issue number}

<!-- Please try to limit your pull request to one type; submit multiple pull requests if needed. -->
<!-- Please try to limit your pull request to one type;
submit multiple pull requests if needed. -->

Please check the type of change your PR introduces:

- [ ] Bugfix
- [ ] Feature
- [ ] Code style update (formatting, renaming)
- [ ] Refactoring (no functional changes, no API changes)
- [ ] Build-related changes
- [ ] Documentation content changes
- [ ] Testing
- [ ] Bugfix
- [ ] Feature
- [ ] Code style update (formatting, renaming)
- [ ] Refactoring (no functional changes, no API changes)
- [ ] Build-related changes
- [ ] Documentation content changes
- [ ] Testing

# What is the new behavior?
## What is the new behavior?

<!-- Please describe the behavior or changes that are being added by this PR. -->

# Does this introduce a breaking change?
## Does this introduce a breaking change?

- [ ] Yes
- [ ] No
- [ ] Yes
- [ ] No
53 changes: 0 additions & 53 deletions .github/workflows/linters.yml

This file was deleted.

5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
name: test

permissions: read-all
ClementWalter marked this conversation as resolved.
Show resolved Hide resolved

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
test:
runs-on: ubuntu-latest-16-cores
runs-on: ubuntu-latest
timeout-minutes: 120
steps:
- uses: actions/checkout@v3
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/trunk-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Trunk

on:
push:
branches: [main]
pull_request:
branches: [main]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions: read-all

jobs:
trunk_check:
name: Trunk Check Runner
runs-on: ubuntu-latest
permissions:
checks: write # For trunk to post annotations
contents: read # For repo checkout

steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Trunk Check
uses: trunk-io/trunk-action@v1
8 changes: 8 additions & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
*out
*logs
*actions
*notifications
*tools
plugins
user_trunk.yaml
user.yaml
10 changes: 10 additions & 0 deletions .trunk/configs/.markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Autoformatter friendly markdownlint config (all formatting rules disabled)
default: true
blank_lines: true
bullet: true
html: true
indentation: true
line_length: true
spaces: true
url: true
whitespace: true
3 changes: 3 additions & 0 deletions .trunk/configs/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"proseWrap": "always"
}
1 change: 1 addition & 0 deletions .trunk/configs/.rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
edition = "2021"
10 changes: 10 additions & 0 deletions .trunk/configs/.yamllint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
rules:
quoted-strings:
required: only-when-needed
extra-allowed: ["{|}"]
empty-values:
forbid-in-block-mappings: true
forbid-in-flow-mappings: true
key-duplicates: {}
octal-values:
forbid-implicit-octal: true
42 changes: 42 additions & 0 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This file controls the behavior of Trunk: https://docs.trunk.io/cli
# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
version: 0.1
cli:
version: 1.16.2
plugins:
sources:
- id: trunk
ref: v1.2.5
uri: https://github.com/trunk-io/plugins
runtimes:
enabled:
- node@18.12.1
- python@3.10.8
lint:
definitions:
- name: clippy
commands:
- run:
cargo clippy --message-format json --locked --workspace
--all-features --all-targets -- --cap-lints=warn --no-deps -D
warnings
enabled:
- actionlint@1.6.26
- checkov@2.4.9
- clippy@SYSTEM
- git-diff-check
- markdownlint@0.37.0
- osv-scanner@1.4.0
- prettier@3.0.3
- rustfmt@1.65.0
- taplo@0.8.1
- trivy@0.45.1
- trufflehog@3.57.0
- yamllint@1.32.0
actions:
disabled:
- trunk-announce
- trunk-fmt-pre-commit
- trunk-check-pre-push
enabled:
- trunk-upgrade-available
8 changes: 7 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading