Skip to content

Commit

Permalink
Merge branch 'dev' into next-v8-bubbo-bubbo
Browse files Browse the repository at this point in the history
  • Loading branch information
Zyie committed Mar 12, 2024
2 parents 99c33b5 + f317ad0 commit 2bbdcc7
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 3 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ on:
branches: [ '**' ]
pull_request:
branches: [ '**' ]
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false
jobs:
build:
strategy:
Expand All @@ -12,3 +22,24 @@ jobs:
uses: ./.github/workflows/game-workflow.yml
with:
game: ${{ matrix.game }}
deploy:
if: github.ref_name == 'main'
needs: build
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Download Artifacts
uses: actions/download-artifact@v4
- name: Setup Pages
uses: actions/configure-pages@v4
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
# Upload entire repository
path: '.'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ Below is a list of games that are currently available in this repository. Each g

- Bubbo Bubbo
- [Code](/bubbo-bubbo/README.md)
- [Play](https://bubbo-bubbo.netlify.app/)
- [Play](https://pixijs.io/open-games/bubbo-bubbo)

- Puzzling Potions
- [Code](/puzzling-potions/README.md)
- [Play](https://puzzling-potions.netlify.app/)
- [Play](https://pixijs.io/open-games/puzzling-potions)

## Tools

Expand Down
2 changes: 1 addition & 1 deletion bubbo-bubbo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"start": "vite --open",
"clean": "rimraf dist/* public/* .assetpack/*",
"prebuild": "run-s clean format:check lint assets types",
"build": "vite build",
"build": "vite build --base \"./\"",
"assets": "assetpack",
"prepreview": "run-s build",
"preview": "vite preview --open",
Expand Down
1 change: 1 addition & 0 deletions puzzling-potions/vite.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export default {
base: './',
server: {
host: true,
port: 8000
Expand Down

0 comments on commit 2bbdcc7

Please sign in to comment.