Merge remote-tracking branch 'upstream/beta' into feature/i18n-debugging

This commit is contained in:
Felix Staud 2024-07-10 13:26:38 -07:00
commit db389631e9
430 changed files with 9097 additions and 12320 deletions
.env.beta.env.production
.github/workflows
package.json
public/audio/bgm
abyss.mp3badlands.mp3battle_alola_champion.mp3battle_alola_elite.mp3battle_aqua_magma_boss.mp3battle_aqua_magma_grunt.mp3battle_bb_elite.mp3battle_champion_alder.mp3battle_champion_geeta.mp3battle_champion_iris.mp3battle_champion_kieran.mp3battle_champion_nemona.mp3battle_final.mp3battle_final_encounter.mp3battle_flare_boss.mp3battle_flare_grunt.mp3battle_galactic_boss.mp3battle_galactic_grunt.mp3battle_galar_champion.mp3battle_galar_elite.mp3battle_galar_gym.mp3battle_hoenn_champion.mp3battle_hoenn_elite.mp3battle_hoenn_gym.mp3battle_johto_champion.mp3battle_johto_gym.mp3battle_kalos_champion.mp3battle_kalos_elite.mp3battle_kalos_gym.mp3battle_kanto_champion.mp3battle_kanto_gym.mp3battle_legendary_arceus.mp3battle_legendary_birds_galar.mp3battle_legendary_calyrex.mp3battle_legendary_deoxys.mp3battle_legendary_dia_pal.mp3battle_legendary_dusk_dawn.mp3battle_legendary_entei.mp3battle_legendary_giratina.mp3battle_legendary_glas_spec.mp3battle_legendary_gro_kyo.mp3battle_legendary_ho_oh.mp3battle_legendary_kanto.mp3battle_legendary_kor_mir.mp3battle_legendary_kyurem.mp3battle_legendary_lake_trio.mp3battle_legendary_loyal_three.mp3battle_legendary_lugia.mp3battle_legendary_ogerpon.mp3battle_legendary_pecharunt.mp3battle_legendary_raikou.mp3battle_legendary_rayquaza.mp3battle_legendary_regis_g5.mp3battle_legendary_regis_g6.mp3battle_legendary_res_zek.mp3battle_legendary_ruinous.mp3battle_legendary_sinnoh.mp3battle_legendary_sol_lun.mp3battle_legendary_suicune.mp3battle_legendary_tapu.mp3battle_legendary_terapagos.mp3battle_legendary_ub.mp3battle_legendary_ultra_nec.mp3battle_legendary_unova.mp3battle_legendary_xern_yvel.mp3battle_legendary_zac_zam.mp3battle_paldea_elite.mp3battle_paldea_gym.mp3battle_plasma_boss.mp3battle_plasma_grunt.mp3battle_rival.mp3battle_rival_2.mp3battle_rival_3.mp3battle_rocket_boss.mp3battle_rocket_grunt.mp3battle_sinnoh_champion.mp3battle_sinnoh_gym.mp3battle_trainer.mp3battle_unova_elite.mp3battle_unova_gym.mp3battle_wild.mp3battle_wild_strong.mp3beach.mp3
bw

3
.env.beta Normal file

@ -0,0 +1,3 @@
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=https://api.beta.pokerogue.net

3
.env.production Normal file

@ -0,0 +1,3 @@
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=https://api.pokerogue.net

33
.github/workflows/deploy-beta.yml vendored Normal file

@ -0,0 +1,33 @@
name: Deploy Beta
on:
push: {}
pull_request: {}
jobs:
deploy:
if: github.repository == 'pagefaultgames/pokerogue'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "20"
- name: Install dependencies
run: npm ci
- name: Build
run: npm run build:beta
env:
NODE_ENV: production
- name: Set up SSH
if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
run: |
mkdir ~/.ssh
echo "${{ secrets.BETA_SSH_PUBLIC_KEY }}" > ~/.ssh/id_ed25519.pub
echo "${{ secrets.BETA_SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/*
ssh-keyscan -H ${{ secrets.BETA_SSH_HOST }} >> ~/.ssh/known_hosts
- name: Deploy build on server
if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
run: |
rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}

@ -6,9 +6,11 @@ on:
push:
branches:
- main # Trigger on push events to the main branch
- beta # Trigger on push events to the beta branch
pull_request:
branches:
- main # Trigger on pull request events targeting the main branch
- beta # Trigger on pull request events targeting the beta branch
jobs:
run-linters: # Define a job named "run-linters"

@ -7,6 +7,7 @@ on:
pull_request:
branches:
- main
- beta
jobs:
pages:

@ -6,9 +6,11 @@ on:
push:
branches:
- main # Trigger on push events to the main branch
- beta # Trigger on push events to the beta branch
pull_request:
branches:
- main # Trigger on pull request events targeting the main branch
- beta # Trigger on pull request events targeting the beta branch
jobs:
run-tests: # Define a job named "run-tests"

@ -7,6 +7,7 @@
"start": "vite",
"start:dev": "vite --mode development",
"build": "vite build",
"build:beta": "vite build --mode beta",
"preview": "vite preview",
"test": "vitest run",
"test:cov": "vitest run --coverage",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More