Skip to content

Commit

Permalink
Reorganize repo (#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
Elmer Bulthuis authored Feb 14, 2024
1 parent 42d54d5 commit 8f1e5ae
Show file tree
Hide file tree
Showing 93 changed files with 1,889 additions and 862 deletions.
34 changes: 0 additions & 34 deletions .github/workflows/publish-goodrouter-net.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/publish-goodrouter-rs.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/workflows/publish-goodrouter-ts.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/publish-goodrouter-www.yml

This file was deleted.

22 changes: 22 additions & 0 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
on:
pull_request: {}
push:
branches:
- "*"

jobs:
formatting:
runs-on: ubuntu-latest
container: node:21.5.0-alpine3.19
steps:
- uses: actions/checkout@v4
- run: npm ci
- run: npm run formatting

spelling:
runs-on: ubuntu-latest
container: node:21.5.0-alpine3.19
steps:
- uses: actions/checkout@v4
- run: npm ci
- run: npm run spelling
9 changes: 3 additions & 6 deletions .github/workflows/test-goodrouter-net.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,19 @@ on:
- "*"
paths:
- fixtures/**
- goodrouter-net/**

env:
PACKAGE: goodrouter-net
- packages/net/**

jobs:
test-spec:
runs-on: ubuntu-latest
container: mcr.microsoft.com/dotnet/sdk:6.0
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: dotnet test

test-lint:
runs-on: ubuntu-latest
container: mcr.microsoft.com/dotnet/sdk:6.0
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: dotnet format --verify-no-changes
27 changes: 5 additions & 22 deletions .github/workflows/test-goodrouter-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ on:
- "*"
paths:
- fixtures/**
- goodrouter-rs/**

env:
PACKAGE: goodrouter
- packages/cargo/**

jobs:
test-unit:
Expand All @@ -16,31 +13,17 @@ jobs:
env:
CARGO_HOME: ${{ github.workspace }}/.cargo
steps:
- uses: actions/checkout@v3
- run: apk add tar
- uses: actions/cache@v3
with:
key: ${{ github.job }}-${{ hashFiles('Cargo.lock') }}
path: |
.cargo/
target/
- uses: actions/checkout@v4
- run: apk add build-base
- run: cargo --package $PACKAGE test --all-targets
- run: cargo test --all-targets

test-lint:
runs-on: ubuntu-latest
container: rust:1.73-alpine3.17
env:
CARGO_HOME: ${{ github.workspace }}/.cargo
steps:
- uses: actions/checkout@v3
- run: apk add tar
- uses: actions/cache@v3
with:
key: ${{ github.job }}-${{ hashFiles('Cargo.lock') }}
path: |
.cargo/
target/
- uses: actions/checkout@v4
- run: apk add musl-dev
- run: rustup component add clippy
- run: cargo --package $PACKAGE clippy --all-targets
- run: cargo clippy --all-targets
27 changes: 8 additions & 19 deletions .github/workflows/test-goodrouter-ts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,22 @@ on:
- "*"
paths:
- fixtures/**
- goodrouter-ts/**

env:
NPM_CONFIG_WORKSPACE: goodrouter-ts
- packages/npm/**

jobs:
test-unit:
runs-on: ubuntu-latest
container: node:20.9-alpine3.17
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: npm ci
- run: npm run build
- run: npm test
- run: npm run build --workspaces --if-present
- run: npm test --workspaces --if-present

test-lint:
audit:
runs-on: ubuntu-latest
container: node:20.9-alpine3.17
steps:
- uses: actions/checkout@v3
- run: npm ci
- run: npm run lint

test-audit:
runs-on: ubuntu-latest
container: node:20.9-alpine3.17
container: node:21.5.0-alpine3.19
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: npm ci
- run: npm audit --audit-level high
- run: npm --workspaces audit --audit-level high
26 changes: 0 additions & 26 deletions .github/workflows/test-goodrouter-www.yml

This file was deleted.

11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
.*

*.tsbuildinfo

node_modules/
target/
coverage/
out/
out-*/
coverage/
obj/
bin/
TestResults/
BenchmarkDotNet.Artifacts/

!.gitignore
!.gitattributes
!.prettierignore
!.editorconfig
!.npmrc
!.eleventy.js

!.vscode/
!.github/
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
out/
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": true,
"source.organizeImports": true
"source.fixAll": "always",
"source.organizeImports": "always"
},
"editor.rulers": [100],
"editor.defaultFormatter": "esbenp.prettier-vscode",
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[workspace]
resolver = "2"
members = ["goodrouter-rs"]
members = ["packages/cargo/*"]
6 changes: 3 additions & 3 deletions Goodrouter.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Goodrouter", "goodrouter-net\Goodrouter\Goodrouter.csproj", "{1BC15477-1358-447E-A5AA-555B8BDCD27A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Goodrouter", "packages\net\Goodrouter\Goodrouter.csproj", "{1BC15477-1358-447E-A5AA-555B8BDCD27A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Goodrouter.Spec", "goodrouter-net\Goodrouter.Spec\Goodrouter.Spec.csproj", "{682FFC74-3F69-4BCD-AA02-A5182BE0DD53}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Goodrouter.Spec", "packages\net\Goodrouter.Spec\Goodrouter.Spec.csproj", "{682FFC74-3F69-4BCD-AA02-A5182BE0DD53}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Goodrouter.Bench", "goodrouter-net\Goodrouter.Bench\Goodrouter.Bench.csproj", "{31FA2B44-1E9A-4647-AD47-14B029577876}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Goodrouter.Bench", "packages\net\Goodrouter.Bench\Goodrouter.Bench.csproj", "{31FA2B44-1E9A-4647-AD47-14B029577876}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
5 changes: 5 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<configuration>
<config>
<add key="defaultPushSource" value="https://api.nuget.org/v3/index.json" />
</config>
</configuration>
Loading

0 comments on commit 8f1e5ae

Please sign in to comment.