diff options
| -rw-r--r-- | .github/workflows/ci-deploy.yml | 4 | ||||
| -rwxr-xr-x | dist/js/app.js | 4 | ||||
| -rwxr-xr-x | dist/pages/about.html | 2 | ||||
| -rwxr-xr-x | dist/sw.js | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml index 505cf14..b36be84 100644 --- a/.github/workflows/ci-deploy.yml +++ b/.github/workflows/ci-deploy.yml @@ -22,8 +22,8 @@ jobs: ref: master - name: Replace files run: | - rm -r * - mv /tmp/dist/* . + rm -r .[!.]* + mv /tmp/dist/.[!.]* . - name: Commit files run: | git config --local user.email "action@github.com" diff --git a/dist/js/app.js b/dist/js/app.js index 6daa06c..339215b 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,11 @@ const app_version = "1.0.14-beta"; +<<<<<<< HEAD const previous_commit = "aebac8bcd0e946f1e7283d8e280e301d52b8d64b"; +======= +const previous_commit = "35b595f806f99ca18365d511ab820ab818da348d"; +>>>>>>> f06c121... Github actions fix if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") diff --git a/dist/pages/about.html b/dist/pages/about.html index af98a69..6405a1d 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@ <div class="row"> <p> <small> - ^HEAD aebac8bcd0e946f1e7283d8e280e301d52b8d64b + ^HEAD 35b595f806f99ca18365d511ab820ab818da348d </small> </p> </div> @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14-beta-aebac8b"; -// commit before the latest is aebac8bcd0e946f1e7283d8e280e301d52b8d64b +const static_cache_name = "site-static-1.0.14-beta-35b595f"; +// commit before the latest is 35b595f806f99ca18365d511ab820ab818da348d // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! |