Skip to content

Commit

Permalink
Revert "Revert "Resolve merge conflicts between random-tests and main""
Browse files Browse the repository at this point in the history
This reverts commit 135b2fb.
  • Loading branch information
derp000 committed Dec 30, 2023
1 parent ddaa651 commit 21efae2
Show file tree
Hide file tree
Showing 57 changed files with 9,811 additions and 22,984 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ['main']

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow one concurrent deployment
concurrency:
group: 'pages'
cancel-in-progress: true

jobs:
# Single deploy job since we're just deploying
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: 'npm'
- name: Install dependencies in Snail Site
run: |
cd snail-site
npm install
- name: Build Snail Site
run: |
cd snail-site
npm run build
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
with:
# Upload dist repository
path: './dist'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
4 changes: 0 additions & 4 deletions SnailSite/.contentlayer/generated/index.d.ts

This file was deleted.

3 changes: 3 additions & 0 deletions SnailSite/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ dist-ssr
*.njsproj
*.sln
*.sw?

# Contentlayer
.contentlayer
2 changes: 2 additions & 0 deletions SnailSite/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# React + TypeScript + Vite

Run `cd SnailSite`, then `npm i`, then `npm run dev`

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:
Expand Down
Loading

0 comments on commit 21efae2

Please sign in to comment.