diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d591bfbcde..e569f24cec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,24 +25,34 @@ jobs: - name: Set Deployed Flag run: | bash ./.github/set-deployed-flag.sh ${{ env.RELEASE_VERSION }} - # Remove entries from the `.gitignore` so the gh-pages action can correctly add+commit them to the pages branch - - name: Build Service Worker + # Builds the data + - name: Build Site run: | node --version npm --version npm i npm run build:data:prod npm run build - npm run build:deploy:prod - npm run build:sw:prod - sed -i 's/sw.js//g' .gitignore - sed -i 's/sw-injector.js//g' .gitignore + # Builds SEO pages - name: Build SEO Pages env: VET_BASE_SITE_URL: https://pf2etools.com/ VET_SEO_IS_SKIP_UA_ETC: true run: | npm run build:seo -- ${{ env.RELEASE_VERSION }} + # Merge and minify scripts, data, etc. + - name: Build Prod + env: + VET_BASE_SITE_URL: https://pf2etools.com/ + VET_SEO_IS_SKIP_UA_ETC: true + run: | + npm run build:deploy:prod + # Remove entries from the `.gitignore` so the gh-pages action can correctly add+commit them to the pages branch + - name: Build Service Worker + run: | + npm run build:sw:prod + sed -i 's/sw.js//g' .gitignore + sed -i 's/sw-injector.js//g' .gitignore # See: https://github.com/JamesIves/github-pages-deploy-action - name: Deploy uses: JamesIves/github-pages-deploy-action@releases/v4 diff --git a/data/changelog.json b/data/changelog.json index 1ef9e1c992..84b68c65f1 100644 --- a/data/changelog.json +++ b/data/changelog.json @@ -119,6 +119,16 @@ "ver": "0.5.5", "date": "2022-06-13", "txt": "- Fix typo in production script" + }, + { + "ver": "0.5.5", + "date": "2022-06-13", + "txt": "- Fix typo in production script" + }, + { + "ver": "0.5.6", + "date": "2022-06-13", + "txt": "- Fix production script" } ] } diff --git a/js/utils.js b/js/utils.js index 74991b6a38..524d5e965e 100644 --- a/js/utils.js +++ b/js/utils.js @@ -5,7 +5,7 @@ if (typeof module !== "undefined") require("./parser.js"); // in deployment, `IS_DEPLOYED = "";` should be set below. IS_DEPLOYED = undefined; -VERSION_NUMBER = /* PF2ETOOLS_VERSION__OPEN */"0.5.5"/* PF2ETOOLS_VERSION__CLOSE */; +VERSION_NUMBER = /* PF2ETOOLS_VERSION__OPEN */"0.5.6"/* PF2ETOOLS_VERSION__CLOSE */; DEPLOYED_STATIC_ROOT = ""; // ""; // FIXME re-enable this when we have a CDN again IS_VTT = false; diff --git a/package.json b/package.json index 21537d478b..42088cb71b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pf2etools", "author": "Pf2eTools", - "version": "0.5.5", + "version": "0.5.6", "license": "MIT", "description": "A site dedicated to making playing games with your friends as easy as possible.", "scripts": {