diff --git a/.github/workflows/linux_release.yml b/.github/workflows/linux_release.yml index e06766c476d..d90e9568fa3 100644 --- a/.github/workflows/linux_release.yml +++ b/.github/workflows/linux_release.yml @@ -37,6 +37,14 @@ jobs: sudo apt-get update sudo apt-get install texlive texlive-xetex texlive-science libxkbcommon-x11-0 xorg-dev libgl1-mesa-dev + - name: Install IFW + shell: bash + run: | + set -x + out_dir=${{ runner.workspace }}/Qt + aqt tool linux tools_ifw 4.1.1 qt.tools.ifw.41 --outputdir="$out_dir" + echo "$out_dir/Tools/QtInstallerFramework/4.1/bin" >> $GITHUB_PATH + - name: Create Build Directory run: cmake -E make_directory ./build/ @@ -44,9 +52,9 @@ jobs: working-directory: ./build shell: bash run: | - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCPACK_BINARY_IFW=OFF \ + cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DLINK_WITH_PYTHON=ON -DBUILD_FORTRAN=ON -DBUILD_PACKAGE:BOOL=ON \ - -DDOCUMENTATION_BUILD="BuildWithAll" -DTEX_INTERACTION="batchmode" \ + -DDOCUMENTATION_BUILD="BuildWithAll" -DTEX_INTERACTION="batchmode" -DENABLE_PCH=OFF \ ../ - name: Build Package @@ -63,6 +71,15 @@ jobs: overwrite: true file_glob: true + - name: Upload IFW to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: build/EnergyPlus-*-x86_64.run + tag: ${{ github.ref }} + overwrite: true + file_glob: true + - name: Upload SH to release uses: svenstaro/upload-release-action@v2 with: diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml index 2037758cf2a..c928c3363fc 100644 --- a/.github/workflows/mac_release.yml +++ b/.github/workflows/mac_release.yml @@ -37,6 +37,14 @@ jobs: brew install --cask mactex echo "/Library/TeX/texbin" >> $GITHUB_PATH + - name: Install IFW + shell: bash + run: | + set -x + out_dir=${{ runner.workspace }}/Qt + aqt tool mac tools_ifw 4.1.1 qt.tools.ifw.41 --outputdir="$out_dir" + echo "$out_dir/Tools/QtInstallerFramework/4.1/bin" >> $GITHUB_PATH + - name: Create Build Directory run: cmake -E make_directory ./build/ @@ -44,7 +52,7 @@ jobs: working-directory: ./build shell: bash run: | - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCPACK_BINARY_IFW=OFF \ + cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET \ -DLINK_WITH_PYTHON=ON -DBUILD_FORTRAN=ON -DBUILD_PACKAGE:BOOL=ON \ -DDOCUMENTATION_BUILD="BuildWithAll" -DTEX_INTERACTION="batchmode" \ diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml index 315cb30637b..4b95dd321d4 100644 --- a/.github/workflows/windows_release.yml +++ b/.github/workflows/windows_release.yml @@ -57,13 +57,13 @@ jobs: ./miktexsetup_standalone --verbose \ --local-package-repository=C:/ProgramData/MiKTeX-Repo \ --remote-package-repository="https://ctan.math.illinois.edu/systems/win32/miktex/tm/packages/" \ - --package-set=basic \ + --package-set=essential \ download echo "Installing from the local package directory previously set up" ./miktexsetup_standalone --verbose \ --local-package-repository=C:/ProgramData/MiKTeX-Repo \ - --package-set=basic \ + --package-set=essential \ --shared \ install @@ -80,6 +80,20 @@ jobs: mpm --find-updates mpm --admin --find-updates + - name: Install required packages + shell: bash + working-directory: ./doc/ + run: | + mpm --verbose --admin --require=@energyplus_packages_windows.lst + + - name: Install IFW + shell: bash + run: | + set -x + out_dir="C:/Qt" + aqt tool windows tools_ifw 4.1.1 qt.tools.ifw.41 --outputdir="$out_dir" + echo "$out_dir/Tools/QtInstallerFramework/4.1/bin" >> $GITHUB_PATH + - name: Create Build Directory run: cmake -E make_directory ./build/ @@ -88,7 +102,7 @@ jobs: shell: bash run: | set -x - cmake -G "Visual Studio 16 2019" -A ${{ matrix.vs-generator }} -DCPACK_BINARY_IFW=OFF \ + cmake -G "Visual Studio 16 2019" -A ${{ matrix.vs-generator }} \ -DLINK_WITH_PYTHON=ON -DBUILD_FORTRAN=ON -DBUILD_PACKAGE:BOOL=ON \ -DDOCUMENTATION_BUILD="BuildWithAll" -DTEX_INTERACTION="batchmode" \ ../ @@ -106,3 +120,12 @@ jobs: tag: ${{ github.ref }} overwrite: true file_glob: true + + - name: Upload IFW to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: build/EnergyPlus-*-Windows-${{ matrix.package-arch }}.exe + tag: ${{ github.ref }} + overwrite: true + file_glob: true