From 2480b5e6a316f4806112f5838058338e263301e3 Mon Sep 17 00:00:00 2001 From: oliver Date: Fri, 8 Aug 2025 17:04:08 +1000 Subject: [PATCH 1/9] pipeline test fix --- .github/workflows/build_static_site.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_static_site.sh b/.github/workflows/build_static_site.sh index 95068ac..16bd9ce 100644 --- a/.github/workflows/build_static_site.sh +++ b/.github/workflows/build_static_site.sh @@ -12,10 +12,10 @@ if ! git diff --quiet $(git merge-base "origin/main" "$1").."$1" -- SplashKitWas echo "========================================" mkdir -p ./splashkitonline/SplashKitWasm/prebuilt/cxx/compiler/ cd ./splashkitonline/SplashKitWasm/prebuilt/cxx/compiler/ - wget -O clang++.js https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/Browser_IDE/compilers/cxx/bin/clang++.js - wget -O clang.wasm.lzma https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/Browser_IDE/compilers/cxx/bin/clang.wasm.lzma - wget -O wasm-ld.js https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/Browser_IDE/compilers/cxx/bin/wasm-ld.js - wget -O lld.wasm.lzma https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/Browser_IDE/compilers/cxx/bin/lld.wasm.lzma + wget -O clang++.js https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/compilers/cxx/bin/clang++.js + wget -O clang.wasm.lzma https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/compilers/cxx/bin/clang.wasm.lzma + wget -O wasm-ld.js https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/compilers/cxx/bin/wasm-ld.js + wget -O lld.wasm.lzma https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/compilers/cxx/bin/lld.wasm.lzma wget -O sysroot.zip https://github.com/WhyPenguins/SplashkitOnline/raw/refs/heads/cxx_language_backend_binaries/SplashKitWasm/prebuilt/sysroot.zip # decompress them - silly since they'll just be re-compressed again, but it is what it is for now... xz -d clang.wasm.lzma @@ -91,7 +91,7 @@ else cd ../ # copy in all the untracked files! - rsync -av --progress --exclude-from="$EXCLUDE_FILE" "prebuilt/" "splashkitonline/Browser_IDE/" + rsync -av --progress --exclude-from="$EXCLUDE_FILE" "prebuilt/" "splashkitonline/" fi @@ -99,7 +99,7 @@ fi echo "========================================" echo "Install Node Dependencies" echo "========================================" -cd ./splashkitonline/Browser_IDE +cd ./splashkitonline npm install @@ -110,7 +110,7 @@ cd ../../ echo "========================================" echo "Re-Structure Static Site" echo "========================================" -cd ./splashkitonline/Browser_IDE +cd ./splashkitonline # if changed, remember to update the explicit excludes above mv node_modules/codemirror codemirror-5.65.15 From 7e27a628d6e99a88bf840b7a699ed3a689593c77 Mon Sep 17 00:00:00 2001 From: oliver Date: Fri, 8 Aug 2025 17:06:15 +1000 Subject: [PATCH 2/9] Second fix --- .github/workflows/build_static_site.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_static_site.sh b/.github/workflows/build_static_site.sh index 16bd9ce..e537b05 100644 --- a/.github/workflows/build_static_site.sh +++ b/.github/workflows/build_static_site.sh @@ -110,7 +110,6 @@ cd ../../ echo "========================================" echo "Re-Structure Static Site" echo "========================================" -cd ./splashkitonline # if changed, remember to update the explicit excludes above mv node_modules/codemirror codemirror-5.65.15 From 7a8aa3472dfb31995c90f66b0791d0aa5eb6c7c2 Mon Sep 17 00:00:00 2001 From: oliver Date: Fri, 8 Aug 2025 17:08:10 +1000 Subject: [PATCH 3/9] Removed problematic cd --- .github/workflows/build_static_site.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build_static_site.sh b/.github/workflows/build_static_site.sh index e537b05..15af5ee 100644 --- a/.github/workflows/build_static_site.sh +++ b/.github/workflows/build_static_site.sh @@ -103,9 +103,6 @@ cd ./splashkitonline npm install -cd ../../ - - echo "========================================" echo "Re-Structure Static Site" @@ -117,7 +114,7 @@ mv node_modules/jszip/dist jszip mv node_modules/@babel/standalone babel mv node_modules/split.js/dist split.js mv node_modules/mime/dist mime -rm -rf external/js-lzma/data +rm -rf js-lzma/data mv ../DemoProjects DemoProjects cd ../ From 64e47043aa06a2ffc3bbe23bac3382841fd151da Mon Sep 17 00:00:00 2001 From: oliver Date: Fri, 8 Aug 2025 17:11:37 +1000 Subject: [PATCH 4/9] Removed copying of demo projects (saved this time) --- .github/workflows/build_static_site.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_static_site.sh b/.github/workflows/build_static_site.sh index 15af5ee..b116d36 100644 --- a/.github/workflows/build_static_site.sh +++ b/.github/workflows/build_static_site.sh @@ -115,6 +115,5 @@ mv node_modules/@babel/standalone babel mv node_modules/split.js/dist split.js mv node_modules/mime/dist mime rm -rf js-lzma/data -mv ../DemoProjects DemoProjects cd ../ From d8a4921791a49da432ed064082d385bb4a9e5ac7 Mon Sep 17 00:00:00 2001 From: oliver Date: Fri, 8 Aug 2025 17:16:47 +1000 Subject: [PATCH 5/9] fix to deploy --- .github/workflows/build_static_site.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_static_site.yml b/.github/workflows/build_static_site.yml index 75c66d5..76a2da7 100644 --- a/.github/workflows/build_static_site.yml +++ b/.github/workflows/build_static_site.yml @@ -85,7 +85,7 @@ jobs: uses: actions/upload-artifact@v4.4.3 with: name: preview-${{ github.sha }} - path: ./splashkitonline/Browser_IDE + path: ./splashkitonline retention-days: 1 compression-level: 8 overwrite: true From 47a0052fffddd264aad2de44f8aeb8d4a02b2e34 Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 20 Sep 2025 15:01:09 +1000 Subject: [PATCH 6/9] View files --- .github/workflows/deploy_github_site.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy_github_site.yml b/.github/workflows/deploy_github_site.yml index 2c96434..64a468f 100644 --- a/.github/workflows/deploy_github_site.yml +++ b/.github/workflows/deploy_github_site.yml @@ -41,6 +41,8 @@ jobs: - name: Download Built Sites working-directory: ./ run: | + ls + pwd sudo apt-get install tree python3 ./script/.github/workflows/download_github_site_previews.py "${{ github.repository }}" static-site tree From f4fd5c0d8d5140cf2f2badf4c782d7a3e844ea41 Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 20 Sep 2025 15:12:58 +1000 Subject: [PATCH 7/9] Further alterations --- .github/workflows/build_static_site.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_static_site.sh b/.github/workflows/build_static_site.sh index b116d36..04adaba 100644 --- a/.github/workflows/build_static_site.sh +++ b/.github/workflows/build_static_site.sh @@ -67,9 +67,9 @@ else # first let's get a list of files _not_ to copy cd ./splashkitonline - TRACKED_FILES=$(git log --pretty=format: --name-only --diff-filter=A -- Browser_IDE| sort - | sed '/^$/d') - EXCLUDE_FILE=$(mktemp) - echo "$TRACKED_FILES" | sed "s|^Browser_IDE||" > "$EXCLUDE_FILE" + #TRACKED_FILES=$(git log --pretty=format: --name-only --diff-filter=A -- Browser_IDE| sort - | sed '/^$/d') + #EXCLUDE_FILE=$(mktemp) + #echo "$TRACKED_FILES" | sed "s|^Browser_IDE||" > "$EXCLUDE_FILE" # add some explicit excludes echo "/codemirror-5.65.15" >> "$EXCLUDE_FILE" From bab0fbcfcb1fae6304c53f2dda73f59e64d3d534 Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 20 Sep 2025 15:18:50 +1000 Subject: [PATCH 8/9] Changes to build script --- .github/workflows/build_static_site.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_static_site.sh b/.github/workflows/build_static_site.sh index 04adaba..b8dc1ee 100644 --- a/.github/workflows/build_static_site.sh +++ b/.github/workflows/build_static_site.sh @@ -12,10 +12,10 @@ if ! git diff --quiet $(git merge-base "origin/main" "$1").."$1" -- SplashKitWas echo "========================================" mkdir -p ./splashkitonline/SplashKitWasm/prebuilt/cxx/compiler/ cd ./splashkitonline/SplashKitWasm/prebuilt/cxx/compiler/ - wget -O clang++.js https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/compilers/cxx/bin/clang++.js - wget -O clang.wasm.lzma https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/compilers/cxx/bin/clang.wasm.lzma - wget -O wasm-ld.js https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/compilers/cxx/bin/wasm-ld.js - wget -O lld.wasm.lzma https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/compilers/cxx/bin/lld.wasm.lzma + wget -O clang++.js https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/Browser_IDE/compilers/cxx/bin/clang++.js + wget -O clang.wasm.lzma https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/Browser_IDE/compilers/cxx/bin/clang.wasm.lzma + wget -O wasm-ld.js https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/Browser_IDE/compilers/cxx/bin/wasm-ld.js + wget -O lld.wasm.lzma https://raw.githubusercontent.com/WhyPenguins/SplashkitOnline/github-live/Browser_IDE/compilers/cxx/bin/lld.wasm.lzma wget -O sysroot.zip https://github.com/WhyPenguins/SplashkitOnline/raw/refs/heads/cxx_language_backend_binaries/SplashKitWasm/prebuilt/sysroot.zip # decompress them - silly since they'll just be re-compressed again, but it is what it is for now... xz -d clang.wasm.lzma From efa2e69bbb44e914360f4f87e09d496bb67c463a Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 20 Sep 2025 15:33:16 +1000 Subject: [PATCH 9/9] Test --- .github/workflows/deploy_github_site.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_github_site.yml b/.github/workflows/deploy_github_site.yml index 64a468f..8e21b5d 100644 --- a/.github/workflows/deploy_github_site.yml +++ b/.github/workflows/deploy_github_site.yml @@ -41,7 +41,7 @@ jobs: - name: Download Built Sites working-directory: ./ run: | - ls + echo | ls >> $GITHUB_OUTPUT pwd sudo apt-get install tree python3 ./script/.github/workflows/download_github_site_previews.py "${{ github.repository }}" static-site