Skip to content

Commit

Permalink
Merge branch 'develop' of gitlab.xiguacity.cn:fee/scratch/scratch-vm …
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
nickhu committed Sep 20, 2024
2 parents f665c21 + 24ce689 commit d6175e3
Show file tree
Hide file tree
Showing 462 changed files with 29,123 additions and 5,222 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ trim_trailing_whitespace = true

[*.{js,html}]
indent_style = space

[.circleci/config.yml]
indent_size = 2
indent_style = space
48 changes: 48 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Deploy playground

on:
workflow_dispatch:
push:
branches: [develop]

concurrency:
group: "deploy"
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
- name: Install dependencies
run: npm ci
- name: Build playground
run: npm run build
- name: Build docs
run: npm run docs
# We expect to see syntax errors from the old jsdoc cli not understanding some of our syntax
# It will still generate what it can, so it's safe to ignore the error
continue-on-error: true
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: ./playground/

deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
permissions:
pages: write
id-token: write
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
27 changes: 11 additions & 16 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI
name: CI

on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 12.x
- run: npm install
- run: npm run build
# - run: npm run test
- uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
- run: npm ci
- run: npm run lint
- run: npm run build
- run: npm run test
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v16
78 changes: 0 additions & 78 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit d6175e3

Please sign in to comment.