Skip to content

Commit

Permalink
Merge pull request #623 from trunk-dev/feature/back_to_trunk_1
Browse files Browse the repository at this point in the history
Bring back trunk-ng into trunk
  • Loading branch information
ctron authored Dec 11, 2023
2 parents 7a27876 + 522d138 commit cdddc60
Show file tree
Hide file tree
Showing 79 changed files with 4,672 additions and 1,656 deletions.
14 changes: 14 additions & 0 deletions .convco/template/commit.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
*
{{~#if scope}} **{{scope}}:**
{{~/if}}
{{#if references}}
{{~#each references}} {{#if @root.linkReferences~}}
[{{this.prefix}}{{this.issue}}]({{issueUrlFormat}})
{{~else}}{{this.prefix}}{{this.issue}}
{{~/if}}{{/each}}
{{~/if}}
{{subject}}
{{~#if hash}} {{#if @root.linkReferences}}([{{shortHash}}]({{commitUrlFormat}})){{else}}({{hash}})
{{~/if}}
{{~/if}}

Empty file added .convco/template/footer.hbs
Empty file.
2 changes: 2 additions & 0 deletions .convco/template/header.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

{{#if isPatch}}###{{else}}##{{/if}}{{#if @root.linkCompare}} [{{version}}]({{compareUrlFormat}}){{else}} {{version}}{{/if}}{{#if title}} "{{title}}"{{/if}}{{#if date}} ({{date}}){{/if}}
19 changes: 19 additions & 0 deletions .convco/template/template.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{> header}}
{{#if noteGroups}}{{#each noteGroups}}

## ⚠ {{title}}

{{#each notes}}* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{this.text}}
{{/each}}
{{/each}}
{{/if}}

{{#each commitGroups}}
{{#if title}}{{#if @root.isPatch}}
##{{else}}
##{{/if}} {{title}}{{/if}}

{{#each commits}}
{{> commit root=@root}}
{{/each}}
{{/each}}
10 changes: 0 additions & 10 deletions .github/pull_request_template.md

This file was deleted.

80 changes: 41 additions & 39 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
name: CI
on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
lint:
name: lint
runs-on: ubuntu-latest
steps:
- name: Setup | Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: |
~/.cargo/registry
Expand All @@ -19,24 +25,13 @@ jobs:
${{ runner.os }}-lint
- name: Setup | Toolchain (clippy)
uses: actions-rs/toolchain@v1
with:
toolchain: stable
default: true
components: clippy
run: |
rustup toolchain install stable --component clippy
rustup default stable
- name: Build | Clippy
uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-targets

- name: Setup | Toolchain (rustfmt)
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
default: true
components: rustfmt
run: |
cargo clippy --all-targets --all-features -- -D warnings
- name: Build | Rustfmt
run: cargo fmt -- --check
Expand All @@ -45,10 +40,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup | Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup | Cache Cargo
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
Expand All @@ -59,10 +54,9 @@ jobs:
${{ runner.os }}-check
- name: Setup | Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
run: |
rustup toolchain install stable
rustup default stable
- name: Build | Check
run: cargo check --all
Expand All @@ -83,10 +77,10 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Setup | Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup | Cache Cargo
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
Expand All @@ -97,67 +91,73 @@ jobs:
${{ runner.os }}-cargo
- name: Setup | Cache | Example proxy
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/proxy/target
key: wasm32-example-proxy
restore-keys: |
wasm32-example-proxy
- name: Setup | Cache | Example seed
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/seed/target
key: wasm32-example-seed
restore-keys: |
wasm32-example-seed
- name: Setup | Cache | Example vanilla
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/vanilla/target
key: wasm32-example-vanilla
restore-keys: |
wasm32-example-vanilla
- name: Setup | Cache | Example webworker
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/webworker/target
key: wasm32-example-webworker
restore-keys: |
wasm32-example-webworker
- name: Setup | Cache | Example webworker-gloo
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/webworker-gloo/target
key: wasm32-example-webworker-gloo
restore-keys: |
wasm32-example-webworker-gloo
- name: Setup | Cache | Example yew
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/yew/target
key: wasm32-example-yew
restore-keys: |
wasm32-example-yew
- name: Setup | Cache | Example yew-tailwindcss
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: examples/yew-tailwindcss/target
key: wasm32-example-yew-tailwindcss
restore-keys: |
wasm32-example-yew-tailwindcss
- name: Setup | Rust
uses: actions-rs/toolchain@v1
- name: Setup | Cache | Example yew-tls
uses: actions/cache@v3
with:
toolchain: stable
profile: minimal
target: wasm32-unknown-unknown
path: examples/yew-tls/target
key: wasm32-example-yew-tls
restore-keys: |
wasm32-example-yew-tls
- name: Setup | Rust
run: |
rustup toolchain install stable --target wasm32-unknown-unknown
rustup default stable
- name: Build | Test
run: cargo test
Expand All @@ -181,5 +181,7 @@ jobs:
run: ${{ matrix.binPath }} --config=examples/yew/Trunk.toml build
- name: Build | Examples | yew-tailwindcss
run: ${{ matrix.binPath }} --config=examples/yew-tailwindcss/Trunk.toml build
- name: Build | Examples | yew-tls
run: ${{ matrix.binPath }} --config=examples/yew-tls/Trunk.toml build
- name: Build | Examples | no-rust
run: ${{ matrix.binPath }} --config=examples/no-rust/Trunk.toml build
16 changes: 11 additions & 5 deletions .github/workflows/pages.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
name: Pages
on:
push:
tags:
- "v*"
# Only run after a successful release
workflow_call:
# Allow to run manually
workflow_dispatch:

permissions:
contents: read
pages: write
id-token: write

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Setup | Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup | Zola
Expand All @@ -23,4 +29,4 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./site/public
cname: trunkrs.dev
cname: trunkrs.dev
Loading

0 comments on commit cdddc60

Please sign in to comment.