diff --git a/.github/workflows/build_static_site.sh b/.github/workflows/build_static_site.sh index 95068ac..b8dc1ee 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" @@ -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,18 +99,14 @@ fi echo "========================================" echo "Install Node Dependencies" echo "========================================" -cd ./splashkitonline/Browser_IDE +cd ./splashkitonline npm install -cd ../../ - - echo "========================================" echo "Re-Structure Static Site" echo "========================================" -cd ./splashkitonline/Browser_IDE # if changed, remember to update the explicit excludes above mv node_modules/codemirror codemirror-5.65.15 @@ -118,7 +114,6 @@ 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 -mv ../DemoProjects DemoProjects +rm -rf js-lzma/data cd ../ 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 diff --git a/.github/workflows/deploy_github_site.yml b/.github/workflows/deploy_github_site.yml index 2c96434..8e21b5d 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: | + echo | ls >> $GITHUB_OUTPUT + pwd sudo apt-get install tree python3 ./script/.github/workflows/download_github_site_previews.py "${{ github.repository }}" static-site tree