Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/matter-ecs/matter into adds…
Browse files Browse the repository at this point in the history
…-hotpathing
  • Loading branch information
Ukendio committed Jan 22, 2024
2 parents d40071a + 4aa29be commit 3cfe69f
Show file tree
Hide file tree
Showing 18 changed files with 733 additions and 111 deletions.
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Bug report
about: Create a report to help us improve
title: ""
labels: bug
assignees: ""
---

## Description

A clear and concise description of what the bug is. Be sure this isn't a
[duplicate report](https://github.com/matter-ecs/matter/issues) (if it is,
contribute to the already opened bug report).

## Steps to reproduce

Steps to reproduce the behavior:

1. Go to '...'
2. Click on '...'
3. Scroll down to '...'
4. See error

## Expected behavior

A clear and concise description of what you expected to happen.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Feature request
about: Suggest an idea for this project
title: ""
labels: feature
assignees: ""
---

## Problem

A clear and concise description of what the problem is or what you would like to
do differently. If there is a related
[issue](https://github.com/matter-ecs/matter/issues), let us know here.

## Proposed solution

A clear and concise description of what you want to happen.

## Alternatives

A clear and concise description of any alternative solutions or features
you've considered or are currently using.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/improvement_suggestion.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Improvement suggestion
about: A minor enhancement or quality of life improvement
title: ""
labels: improvement
assignees: ""
---

## Current behavior

A clear and concise description of the current behavior, and why you think it
can be enhanced. If there is a related
[issue](https://github.com/matter-ecs/matter/issues), let us know here.

## Proposed improvement

A clear and concise description of what you want to happen.

## Additional context

Provide any additional context or examples that can help us understand the
importance of this improvement.
17 changes: 17 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
## Proposed changes

A clear and concise description of what your changes are. Explain to
maintainers why we should accept your solution. Be sure to adhere to our
[contribution guidelines](https://github.com/matter-ecs/matter/blob/main/CONTRIBUTING.md).

## Related issues

Explain how this pull request relates to any relevant
[issues](https://github.com/matter-ecs/matter/issues). Bugs and features should
always have related issues.

## Additional comments

If the changes are particularly complex, elaborate here. You can start off
discussion by addressing any foreseen issues or questions with the changes,
and by explaining why you chose this solution.
80 changes: 80 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: CI

on:
pull_request:
push:
branches:
- main

jobs:
format:
name: Formatting
runs-on: ubuntu-latest
steps:
- name: Checkout Project
uses: actions/checkout@v3

- name: Install Aftman
uses: ok-nick/[email protected]

- name: Check Formatting
run: stylua --check .

lint:
name: Linting
runs-on: ubuntu-latest
steps:
- name: Checkout Project
uses: actions/checkout@v3

- name: Install Aftman
uses: ok-nick/[email protected]

- name: Check Linting
run: selene lib tests example/src

build:
name: Build
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Checkout Project
uses: actions/checkout@v3

- name: Install Aftman
uses: ok-nick/[email protected]

- name: Install Dependencies
run: wally install

- name: Build
run: rojo build --output build.rbxm default.project.json

- name: Upload Build Artifact
uses: actions/upload-artifact@v3
with:
name: build
path: build.rbxm

build-example:
name: Build Example Game
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Checkout Project
uses: actions/checkout@v3

- name: Install Aftman
uses: ok-nick/[email protected]

- name: Install Dependencies
run: wally install --project-path example

- name: Build
run: rojo build --output build.rbxm example.project.json

- name: Upload Build Artifact
uses: actions/upload-artifact@v3
with:
name: build-example
path: build.rbxm
38 changes: 0 additions & 38 deletions .github/workflows/ci.yml

This file was deleted.

47 changes: 47 additions & 0 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Docs

on:
pull_request:
push:
branches:
- main

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout Project
uses: actions/checkout@v3

- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 16

- name: Install Moonwave
run: npm install -g moonwave

- name: Generate Docs
run: moonwave build

- name: Upload Build Artifact
uses: actions/upload-pages-artifact@v3
with:
path: build

deploy:
name: Deploy
if: github.event_name == 'push'
needs:
- build
permissions:
pages: write
id-token: write
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout Project
uses: actions/deploy-pages@v4
34 changes: 20 additions & 14 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
tags: ["v*"]

jobs:
build-matter:
name: Build Matter
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout Project
Expand All @@ -15,14 +15,17 @@ jobs:
- name: Install Aftman
uses: ok-nick/[email protected]

- name: Build Matter
run: rojo build --output matter.rbxm default.project.json
- name: Install Dependencies
run: wally install

- name: Build
run: rojo build --output build.rbxm default.project.json

- name: Upload Build Artifact
uses: actions/upload-artifact@v3
with:
name: matter
path: matter.rbxm
name: build
path: build.rbxm

build-example:
name: Build Example Game
Expand All @@ -34,18 +37,21 @@ jobs:
- name: Install Aftman
uses: ok-nick/[email protected]

- name: Install Dependencies
run: wally install --project-path example

- name: Build Example Game
run: rojo build --output example.rbxl example.project.json
run: rojo build --output build.rbxl example.project.json

- name: Upload Build Artifact
uses: actions/upload-artifact@v3
with:
name: example
path: example.rbxl
name: build-example
path: build.rbxl

release:
name: Release
needs: [build-matter, build-example]
needs: [build, build-example]
runs-on: ubuntu-latest
steps:
- name: Checkout Project
Expand All @@ -54,13 +60,13 @@ jobs:
- name: Download Matter Build
uses: actions/download-artifact@v3
with:
name: matter
name: build
path: matter.rbxm

- name: Download Example Game Build
uses: actions/download-artifact@v3
with:
name: example
name: build-example
path: AttackOfTheKillerRoombas.rbxl

- name: Create Release
Expand All @@ -84,5 +90,5 @@ jobs:
- name: Install Aftman
uses: ok-nick/[email protected]

- name: Publish Matter
run: wally publish --token ${{ secrets.WALLY_TOKEN }}
- name: Publish
run: wally publish --token ${{ secrets.WALLY_AUTH_TOKEN }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ luac.out
*.hex

DevPackages
/*/Packages
Packages
roblox.toml
build
*.rbxl
Expand Down
Loading

0 comments on commit 3cfe69f

Please sign in to comment.