ctome
/
crimsontome.com
mirror of https://github.com/CrimsonTome/crimsontome.com.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

main
CrimsonTome 2022-09-17 03:18:52 +01:00 committed by Rowan Clark
parent f890176bd3
commit 08eb33ed28
No known key found for this signature in database
GPG Key ID: F620D51904044094
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/node CI.yml vendored
View File

@ -6,9 +6,9 @@ name: CI
on: on:
# Triggers the workflow on push or pull request events but only for the "main" branch # Triggers the workflow on push or pull request events but only for the "main" branch
push: push:
branches: [ "main" ] branches: ["main"]
pull_request: pull_request:
branches: [ "main" ] branches: ["main"]
# Allows you to run this workflow manually from the Actions tab # Allows you to run this workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:
@ -28,6 +28,12 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
<<<<<<< HEAD
node-version: '18.x' node-version: '18.x'
- name: run Prettier
run: npx prettier --check .
=======
node-version: "18.x"
>>>>>>> 229a8cf (format all with prettier)
- name: Run npm - name: Run npm
run: npm install && npm run build run: npm install && npm run build