Skip to content

Commit f3673e5

Browse files
PepperLolaPepperLola
authored
Merge branch 'dev' into ryan/1973/animate-game-piece-intake
2 parents 50b923d + de9a478 commit f3673e5

File tree

83 files changed

+2485
-1730
lines changed

Some content is hidden

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

83 files changed

+2485
-1730
lines changed

‎.github/workflows/FissionBiome.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Fission - Biome Format and Lint Validation
2+
3+
on:
4+
workflow_dispatch: {}
5+
push:
6+
branches: [prod, dev]
7+
pull_request:
8+
branches: [prod, dev]
9+
10+
jobs:
11+
runBiomeValidationScript:
12+
name: Biome Validation
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout Code
16+
uses: actions/checkout@v4
17+
- name: Bun Runtime Setup
18+
uses: oven-sh/setup-bun@v2
19+
with:
20+
bun-version: latest
21+
22+
- name: Cache Dependencies
23+
uses: actions/cache@v3
24+
with:
25+
key: "${{runner.os}}-npm-fission-${{hashFiles('fission/package.json')}}"
26+
path: "fission/node_modules"
27+
restore-keys: |
28+
${{runner.os}}-npm-fission-
29+
${{runner.os}}-npm
30+
31+
- name: Install Dependencies
32+
run: |
33+
cd fission
34+
bun install
35+
36+
- name: Lint
37+
id: lint-validation
38+
if: ${{ always() }}
39+
run: |
40+
cd fission
41+
bun run lint && echo "Biome Linting Validation Passed" || (echo "Biome Linting Validation Failed" && exit 1)
42+
43+
- name: Format
44+
id: format-validation
45+
if: ${{ always() }}
46+
run: |
47+
cd fission
48+
bun run fmt && echo "Biome Formatting Validation Passed" || (echo "Biome Formatting Validation Failed" && exit 1)

‎.github/workflows/FissionBuild.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Fission - Build
33
on:
44
workflow_dispatch: {}
55
pull_request:
6-
branches: [ prod, dev ]
6+
branches: [prod, dev]
77

88
jobs:
99
buildFission:
@@ -12,26 +12,26 @@ jobs:
1212
steps:
1313
- name: Checkout Code
1414
uses: actions/checkout@v4
15-
- name: JavaScript Setup
16-
uses: actions/setup-node@v4
15+
- name: Bun Runtime Setup
16+
uses: oven-sh/setup-bun@v2
1717
with:
18-
node-version: 20
18+
bun-version: latest
1919

2020
- name: Cache Node Dependencies
2121
uses: actions/cache@v3
2222
with:
2323
key: "${{runner.os}}-npm-fission-${{hashFiles('fission/package.json')}}"
24-
path: 'fission/node_modules'
24+
path: "fission/node_modules"
2525
restore-keys: |
2626
${{runner.os}}-npm-fission-
2727
${{runner.os}}-npm
2828
2929
- name: Install Dependencies
3030
run: |
3131
cd fission
32-
npm install
32+
bun install
3333
3434
- name: Build Fission
3535
run: |
3636
cd fission
37-
npm run build && echo "Build Passed" || (echo "Build Failed" && exit 1)
37+
bun run build && echo "Build Passed" || (echo "Build Failed" && exit 1)

‎.github/workflows/FissionESLintFormat.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎.github/workflows/FissionPackage.yml

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,62 @@ name: Fission - Package
33
on:
44
workflow_dispatch: {}
55
push:
6-
branches: [ prod, dev ]
6+
branches: [prod, dev]
77

88
jobs:
99
runUnitTests:
1010
name: Package
1111
runs-on: ubuntu-latest
1212
steps:
13-
- name: Checkout Code
14-
uses: actions/checkout@v4
15-
- name: JavaScript Setup
16-
uses: actions/setup-node@v4
17-
with:
18-
node-version: 20
13+
- name: Checkout Code
14+
uses: actions/checkout@v4
15+
- name: Bun Runtime Setup
16+
uses: oven-sh/setup-bun@v2
17+
with:
18+
bun-version: latest
1919

20-
- name: Get date
21-
id: date # this is used on variable path
22-
run: |
23-
echo "timestamp=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_OUTPUT
20+
- name: Get date
21+
id: date # this is used on variable path
22+
run: |
23+
echo "timestamp=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_OUTPUT
2424
25-
- name: Cache Node Dependencies
26-
uses: actions/cache@v3
27-
with:
28-
key: "${{runner.os}}-npm-fission-${{hashFiles('fission/package.json')}}"
29-
path: 'fission/node_modules'
30-
restore-keys: |
31-
${{runner.os}}-npm-fission-
32-
${{runner.os}}-npm
25+
- name: Cache Dependencies
26+
uses: actions/cache@v3
27+
with:
28+
key: "${{runner.os}}-npm-fission-${{hashFiles('fission/package.json')}}"
29+
path: "fission/node_modules"
30+
restore-keys: |
31+
${{runner.os}}-npm-fission-
32+
${{runner.os}}-npm
3333
34-
- name: Install Dependencies
35-
run: |
36-
cd fission
37-
npm install
34+
- name: Install Dependencies
35+
run: |
36+
cd fission
37+
bun install
3838
39-
- name: Get package info
40-
id: info
41-
uses: codex-team/action-nodejs-package-info@v1.1
42-
with:
43-
path: fission/
39+
- name: Get package info
40+
id: info
41+
uses: codex-team/action-nodejs-package-info@v1.1
42+
with:
43+
path: fission/
4444

45-
- name: Build
46-
id: build
47-
run: |
48-
cd fission
49-
npm run build:prod
50-
npm run build:dev
45+
- name: Build
46+
id: build
47+
run: |
48+
cd fission
49+
bun run build:prod
50+
bun run build:dev
5151
52-
- name: Upload Artifact
53-
uses: actions/upload-artifact@v4
54-
id: upload-artifact-prod
55-
with:
56-
name: "${{ steps.info.outputs.name }}@${{ steps.info.outputs.version }}[${{ steps.date.outputs.timestamp }}]"
57-
path: fission/dist/prod/
52+
- name: Upload Artifact
53+
uses: actions/upload-artifact@v4
54+
id: upload-artifact-prod
55+
with:
56+
name: "${{ steps.info.outputs.name }}@${{ steps.info.outputs.version }}[${{ steps.date.outputs.timestamp }}]"
57+
path: fission/dist/prod/
5858

59-
- name: Upload Artifact
60-
uses: actions/upload-artifact@v4
61-
id: upload-artifact-dev
62-
with:
63-
name: "${{ steps.info.outputs.name }}-dev@${{ steps.info.outputs.version }}[${{ steps.date.outputs.timestamp }}]"
64-
path: fission/dist/dev/
59+
- name: Upload Artifact
60+
uses: actions/upload-artifact@v4
61+
id: upload-artifact-dev
62+
with:
63+
name: "${{ steps.info.outputs.name }}-dev@${{ steps.info.outputs.version }}[${{ steps.date.outputs.timestamp }}]"
64+
path: fission/dist/dev/

‎.github/workflows/FissionUnitTest.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ name: Fission - Unit Test
33
on:
44
workflow_dispatch: {}
55
push:
6-
branches: [ prod, dev ]
6+
branches: [prod, dev]
77
pull_request:
8-
branches: [ prod, dev ]
8+
branches: [prod, dev]
99

1010
jobs:
11-
1211
runUnitTests:
1312
name: Playwright Unit Tests
1413
container:
@@ -25,7 +24,6 @@ jobs:
2524
with:
2625
node-version: 20
2726

28-
2927
- name: Cache Unzipped Synthesis Assets
3028
id: cache-assets
3129
uses: actions/cache@v3
@@ -41,16 +39,15 @@ jobs:
4139
apt install git-lfs unzip
4240
git config --global --add safe.directory `pwd`
4341
git lfs pull
44-
42+
4543
cd fission
4644
unzip -o public/assetpack.zip -d public/ || echo
4745
48-
4946
- name: Cache Node Dependencies
5047
uses: actions/cache@v3
5148
with:
5249
key: "${{runner.os}}-npm-fission-${{hashFiles('fission/package.json')}}"
53-
path: 'fission/node_modules'
50+
path: "fission/node_modules"
5451
restore-keys: |
5552
${{runner.os}}-npm-fission-
5653
${{runner.os}}-npm

0 commit comments

Comments
 (0)