Skip to content

Commit d8c4726

Browse files
christopher-busschristopher-buss
authored
Merge pull request #125 from christopher-buss/develop
Deploy to production
2 parents 3c31bc7 + ce5a9a3 commit d8c4726

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+3370
-1855
lines changed

‎.github/workflows/ci.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ permissions:
1010
contents: write
1111
packages: write
1212

13+
env:
14+
CI: true
15+
HUSKY: 0
16+
1317
jobs:
1418
build:
1519
runs-on: ubuntu-latest
@@ -24,7 +28,7 @@ jobs:
2428
uses: pnpm/action-setup@v3
2529

2630
- name: Use Node.js ${{ matrix.node-version }}
27-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4
31+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
2832
with:
2933
node-version: ${{ matrix.node-version }}
3034
cache: pnpm

‎.github/workflows/release-development.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- develop
7-
paths-ignore:
8-
- README.md
9-
- LICENSE.md
10-
- 'scripts/**'
11-
- '.github/**'
7+
paths:
8+
- 'src/**/*'
9+
- default.project.json
10+
- mantle.yml
11+
- package.json
1212
workflow_dispatch:
1313

1414
permissions:
@@ -30,13 +30,16 @@ jobs:
3030
uses: pnpm/action-setup@v3
3131

3232
- name: Use Node.js 20
33-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4
33+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
3434
with:
3535
node-version: 20
3636
cache: pnpm
3737

3838
- name: Install dependencies
39-
run: pnpm install
39+
run: pnpm install --prod
40+
41+
- name: Install roblox-ts
42+
run: pnpm add roblox-ts
4043

4144
- name: Setup Aftman
4245
uses: ok-nick/setup-aftman@e226f24209f47677da7b215bab44f6351a2c043b # v0.4.2
@@ -50,7 +53,7 @@ jobs:
5053
run: rojo build ./default.project.json --output place.rbxlx
5154

5255
- name: Upload place
53-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
56+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
5457
with:
5558
name: place
5659
path: place.rbxlx
@@ -71,7 +74,7 @@ jobs:
7174
token: ${{ secrets.GITHUB_TOKEN }}
7275

7376
- name: Download place artifact
74-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4
77+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
7578
with:
7679
name: place
7780

‎.github/workflows/release.yml

+34-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
name: Release
22

33
on:
4-
push:
4+
pull_request:
5+
types:
6+
- closed
57
branches:
68
- main
7-
paths-ignore:
8-
- README.md
9-
- LICENSE.md
10-
- 'scripts/**'
11-
- '.github/**'
9+
paths:
10+
- 'src/**/*'
11+
- build.project.json
12+
- mantle.yml
13+
- package.json
1214
workflow_dispatch:
15+
inputs:
16+
version:
17+
type: string
18+
required: true
19+
description: Version to release
1320

1421
permissions:
1522
contents: write
@@ -30,13 +37,16 @@ jobs:
3037
uses: pnpm/action-setup@v3
3138

3239
- name: Use Node.js 20
33-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4
40+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
3441
with:
3542
node-version: 20
3643
cache: pnpm
3744

3845
- name: Install dependencies
39-
run: pnpm install
46+
run: pnpm install --prod
47+
48+
- name: Install roblox-ts
49+
run: pnpm add roblox-ts
4050

4151
- name: Setup Aftman
4252
uses: ok-nick/setup-aftman@e226f24209f47677da7b215bab44f6351a2c043b # v0.4.2
@@ -50,7 +60,7 @@ jobs:
5060
run: rojo build ./build.project.json --output place.rbxlx
5161

5262
- name: Upload place
53-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
63+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
5464
with:
5565
name: place
5666
path: place.rbxlx
@@ -71,7 +81,7 @@ jobs:
7181
token: ${{ secrets.GITHUB_TOKEN }}
7282

7383
- name: Download place artifact
74-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4
84+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
7585
with:
7686
name: place
7787

@@ -81,3 +91,17 @@ jobs:
8191
ROBLOSECURITY: ${{ secrets.ROBLOSECURITY }}
8292
MANTLE_AWS_ACCESS_KEY_ID: ${{ secrets.MANTLE_AWS_ACCESS_KEY_ID }}
8393
MANTLE_AWS_SECRET_ACCESS_KEY: ${{ secrets.MANTLE_AWS_SECRET_ACCESS_KEY }}
94+
95+
release_workflow:
96+
runs-on: ubuntu-latest
97+
needs: deploy
98+
steps:
99+
- name: GitFlow workflow action - Release workflows
100+
uses: hoangvvo/gitflow-workflow-action@6f190b60eedc913790eeeee8077426c297ea9c0e # 0.3.7
101+
with:
102+
develop_branch: develop
103+
main_branch: main
104+
merge_back_from_main: false
105+
version: ${{ inputs.version }}
106+
env:
107+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ sourcemap.json
1414
*.rbxlx
1515

1616
# Bundled eslint config
17-
*.mjs
17+
*.mjs
18+
19+
.env

‎.husky/commit-msg

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pnpm dlx commitlint --edit \

‎.husky/install.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Skip Husky install in production and CI
2+
if (process.env.NODE_ENV === 'production' || process.env.CI === 'true') {
3+
process.exit(0)
4+
}
5+
6+
const husky = (await import('husky')).default
7+
console.log(husky())

‎.husky/post-merge

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
# matches only the package-lock.json inside project directory
5+
npx git-pull-run --pattern "pnpm-lock.yaml" --command "pnpm install"

‎.husky/pre-commit

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pnpm lint-staged

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ strict-peer-dependencies=false
22
shamefully-hoist=true
33
ignore-workspace-root-check=true
44
shell-emulator=true
5+
save-exact=true

‎.prettierrc.config.ts

-15
This file was deleted.

‎.vscode/extensions.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"dbaeumer.vscode-eslint",
55
"flamework.flamework-vscode",
66
"roblox-ts.vscode-roblox-ts",
7-
"streetsidesoftware.code-spell-checker",
87
"antfu.file-nesting",
98
"evaera.vscode-rojo",
109
"wayou.vscode-todo-highlight"

‎.vscode/settings.json

+13-77
Original file line numberDiff line numberDiff line change
@@ -5,89 +5,25 @@
55
"eslint.format.enable": true,
66
// Enable the ESlint flat config support
77
"eslint.useFlatConfig": true,
8-
"eslint.validate": ["typescript", "typescriptreact", "markdown", "json", "jsonc", "yaml", "toml"],
8+
"eslint.validate": ["typescript", "typescriptreact", "markdown", "json", "jsonc", "yaml", "toml", "luau"],
99
// Silent the stylistic rules in you IDE, but still auto fix them
1010
"eslint.rules.customizations": [
11-
{
12-
"rule": "style/*",
13-
"severity": "off"
14-
},
15-
{
16-
"rule": "format/*",
17-
"severity": "off"
18-
},
19-
{
20-
"rule": "*-indent",
21-
"severity": "off"
22-
},
23-
{
24-
"rule": "*-spacing",
25-
"severity": "off"
26-
},
27-
{
28-
"rule": "no/autofix/*",
29-
"severity": "error"
30-
},
31-
{
32-
"rule": "*-spaces",
33-
"severity": "off"
34-
},
35-
{
36-
"rule": "*-order",
37-
"severity": "off"
38-
},
39-
{
40-
"rule": "*-dangle",
41-
"severity": "off"
42-
},
43-
{
44-
"rule": "*-newline",
45-
"severity": "off"
46-
},
47-
{
48-
"rule": "*quotes",
49-
"severity": "off"
50-
},
51-
{
52-
"rule": "*semi",
53-
"severity": "off"
54-
}
11+
{ "rule": "style/*", "severity": "off" },
12+
{ "rule": "format/*", "severity": "off" },
13+
{ "rule": "*-indent", "severity": "off" },
14+
{ "rule": "*-spacing", "severity": "off" },
15+
{ "rule": "no/autofix/*", "severity": "error" },
16+
{ "rule": "*-spaces", "severity": "off" },
17+
{ "rule": "*-order", "severity": "off" },
18+
{ "rule": "*-dangle", "severity": "off" },
19+
{ "rule": "*-newline", "severity": "off" },
20+
{ "rule": "*quotes", "severity": "off" },
21+
{ "rule": "*semi", "severity": "off" }
5522
],
5623
// Auto fix
5724
"editor.codeActionsOnSave": {
5825
"source.fixAll.eslint": "always",
5926
"source.organizeImports": "never"
6027
},
61-
"npm.packageManager": "pnpm",
62-
"cSpell.words": [
63-
"blureffect",
64-
"canvasgroup",
65-
"darklua",
66-
"Flamework",
67-
"imagelabel",
68-
"leaderboard",
69-
"Leaderstat",
70-
"Leaderstats",
71-
"lifecycles",
72-
"profilebegin",
73-
"proximityprompt",
74-
"rbxassetid",
75-
"rbxts",
76-
"rbxtsc",
77-
"rigidconstraint",
78-
"Roblox",
79-
"rojo",
80-
"screengui",
81-
"scrollingframe",
82-
"textbutton",
83-
"textlabel",
84-
"tostring",
85-
"traceback",
86-
"typeof",
87-
"uicorner",
88-
"uigridlayout",
89-
"uipadding",
90-
"viewportframe",
91-
"worldmodel"
92-
]
28+
"npm.packageManager": "pnpm"
9329
}

0 commit comments

Comments
 (0)