Skip to content

Testing #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luna115-onCode merged 6 commits into from
Jun 7, 2025
Merged

Testing #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e118395
Fixed overwritting other envs files (#2)
Luna115-onCode Jun 7, 2025
8e4af14
test (#4)
Luna115-onCode Jun 7, 2025
9ca8e63
Test (#6)
Luna115-onCode Jun 7, 2025
3afa075
Test fixed? (#7)
Luna115-onCode Jun 7, 2025
65c7332
Merge branch 'release' into testing
Luna115-onCode Jun 7, 2025
752182f
Test (#9)
Luna115-onCode Jun 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
id: set-env
run: |
echo "::set-output name=build_env::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo 'production'; else echo 'development'; fi)"
echo "::set-output name=path::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo '/'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo '/test'; else echo '/development'; fi)"
echo "::set-output name=page_root::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo '/CheemsBonkGame/'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo '/CheemsBonkGame/test/'; else echo '/CheemsBonkGame/development/'; fi)"
echo "::set-output name=path::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo 'app'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo 'test'; else echo 'development'; fi)"
echo "::set-output name=page_root::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo '/CheemsBonkGame/app/'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo '/CheemsBonkGame/test/'; else echo '/CheemsBonkGame/development/'; fi)"
echo "::set-output name=build_prefix::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo 'prod'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo 'test'; else echo 'dev'; fi)"
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -43,11 +43,6 @@ jobs:
cp .pwa/favicon-$build_prefix.ico public/img/favicon.ico
rm public/manifest.webmanifest
cp .pwa/manifest-$build_prefix.webmanifest public/manifest.webmanifest
if [ "$build_prefix" = "prod" ]; then
cp .pwa/ngsw-config-prod.json ngsw-config.json
else
cp .pwa/ngsw-config-other.json ngsw-config.json
fi

- name: Build the application
env:
Expand Down Expand Up @@ -77,18 +72,23 @@ jobs:
env:
path: ${{ steps.set-env.outputs.path }}
run: |
target_dir="deploy-folder$path"
target_dir="deploy-folder/$path"
mkdir -p "$target_dir"
find "$target_dir" -mindepth 1 -maxdepth 1 -exec rm -rf {} +
find "$target_dir" -mindepth 1 -not -name '.git' -exec rm -rf {} +

- name: Copy New Files to Deploy Folder
env:
path: ${{ steps.set-env.outputs.path }}
build_env: ${{ steps.set-env.outputs.build_env }}
run: |
target_dir="deploy-folder$path"
target_dir="deploy-folder/$path"
mkdir -p "$target_dir"
cp -r dist/cheems-angular/browser/* "$target_dir/"
cp README.md .gitignore "$target_dir/"
cp -r dist/cheems-angular/browser/* "$target_dir"
cp README.md .gitignore "$target_dir"
if [ "$build_env" = "production" ]; then
cp .pwa/inde.html "deploy-folder/"
cp README.md .gitignore "deploy-folder/"
fi

- name: Commit and Deploy to GitHub Pages
working-directory: deploy-folder
Expand Down
15 changes: 15 additions & 0 deletions .pwa/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="refresh" content="0; url=/CheemsBonkGame/app/">
<title>Cheems Bonk Game</title>
</head>
<body>
<noscript>
<strong>We're sorry but Cheems Bonk Game doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<p>If you are not redirected automatically, follow this <a href="/CheemsBonkGame/app/">link to the app</a>.</p>
</body>
</html>
12 changes: 6 additions & 6 deletions .pwa/manifest-prod.webmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@
"short_name": "Cheems Bonk Game",
"description": "A fun and interactive game featuring Cheems Bonk.",
"display": "standalone",
"scope": "/CheemsBonkGame/",
"start_url": "/CheemsBonkGame/",
"scope": "/CheemsBonkGame/app/",
"start_url": "/CheemsBonkGame/app/",
"icons": [
{
"src": "/CheemsBonkGame/img/icons/pwa/icon-72x72.png",
"src": "/CheemsBonkGame/app/img/icons/pwa/icon-72x72.png",
"sizes": "72x72",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "/CheemsBonkGame/img/icons/pwa/icon-144x144.png",
"src": "/CheemsBonkGame/app/img/icons/pwa/icon-144x144.png",
"sizes": "144x144",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "/CheemsBonkGame/img/icons/pwa/icon-192x192.png",
"src": "/CheemsBonkGame/app/img/icons/pwa/icon-192x192.png",
"sizes": "192x192",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "/CheemsBonkGame/img/icons/pwa/icon-512x512.png",
"src": "/CheemsBonkGame/app/img/icons/pwa/icon-512x512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable any"
Expand Down
30 changes: 0 additions & 30 deletions .pwa/ngsw-config-other.json
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions .pwa/ngsw-config-prod.json
View file
Open in desktop

This file was deleted.

Loading