Skip to content

Commit

Permalink
Merge branch 'develop' into new-api-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
Ianyourgod committed Nov 10, 2024
2 parents 1395ac5 + ee27c07 commit e2440cf
Show file tree
Hide file tree
Showing 55 changed files with 11,125 additions and 3,791 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ jobs:
with:
node-version: 16.x
- name: Install dependencies and build site
run: npm i -g pnpm@v6 && pnpm up && pnpm i --shamefully-hoist --force && NODE_ENV=production webpack --bail
#run: npm i -g bun && bun i && NODE_ENV=production webpack --bail
run: npm i -g pnpm@v6 && pnpm i --shamefully-hoist --force && NODE_ENV=production webpack --bail
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
Expand All @@ -36,7 +37,7 @@ jobs:
deploy:
environment:
name: github-pages
url: 'https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/project'
url: 'https://penguinmod.com/project'
runs-on: ubuntu-latest
needs: build
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scratch-gui modified for use in [TurboWarp](https://turbowarp.org/) then modified for use in [PenguinMod](https://jwklong.github.io/penguinmod.github.io) 😀
scratch-gui modified for use in [TurboWarp](https://turbowarp.org/) then modified for use in [PenguinMod](https://studio.penguinmod.com) 😀
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/PenguinMod/penguinmod.github.io/)
## Setup

Expand Down
Binary file added favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e2440cf

Please sign in to comment.