@@ -95,28 +95,29 @@ jobs:
9595 - name : Cache Zlib
9696 id : cache-zlib
9797 if : runner.os == 'Windows'
98- uses : actions/cache@v3
98+ uses : actions/cache@v3.0.11
9999 with :
100- path : |
101- C:/zlib
102- D:/a/ff7tk/ff7tk/build/src/utils/zlib.dll
103- key : ${{ runner.os }}${{ matrix.config.WIN_ARCH }}-zlib3
100+ path : C:/zlib
101+ key : ${{ runner.os }}${{ matrix.config.WIN_ARCH }}-zlib-1.2.13
102+
104103 - name : Cache Chocolatey
105104 id : cache-choco
106105 if : (runner.os == 'Windows')
107- uses : actions/cache@v3
106+ uses : actions/cache@v3.0.11
108107 with :
109108 path : |
110109 C:/ProgramData/chocolatey/bin/
111110 C:/ProgramData/chocolatey/lib/ninja
112111 C:/ProgramData/chocolatey/lib/doxygen.install
113112 C:/ProgramData/chocolatey/lib/Graphviz
114- " C:/Program Files /doxygen"
115- " C:/Program Files /Graphviz"
116- key : cache-chocolatey-2 ${{ matrix.config.WIN_ARCH }}
117- - name : Env Script (Windows)
118- uses : ilammy/msvc-dev-cmd@v1
113+ C:/Program* /doxygen/
114+ C:/Program* /Graphviz/
115+ key : cache-chocolatey${{ matrix.config.WIN_ARCH }}
116+
117+ - name : Setup MSVC Shell For Windows
119118 if : runner.os == 'Windows'
119+ uses : ilammy/msvc-dev-cmd@v1
120+
120121 - name : Install Dependencies
121122 if : ((runner.os == 'Windows') && (steps.cache-choco.outputs.cache-hit != 'true')) || (runner.os != 'Windows')
122123 shell : bash
@@ -137,21 +138,24 @@ jobs:
137138 cache : true
138139 cache-key-prefix : ${{runner.os}}-${{env.WIN_ARCH}}-${{env.QtKey}}
139140 tools : ${{env.QtTools}}
140- - name : Install Zlib ( Windows)
141+ - name : Build Zlib For Windows
141142 if : (runner.os == 'Windows') && (steps.cache-zlib.outputs.cache-hit != 'true')
142143 run : |
143- git clone -q --branch=v1.2.11 https://github.com/madler/zlib ${{github.workspace}}\zlib-git
144+ git clone -q --branch=v1.2.13 https://github.com/madler/zlib ${{github.workspace}}\zlib-git
144145 cmake -S${{github.workspace}}\zlib-git -B${{github.workspace}}\zlib-git\build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=C:/zlib
145146 cmake --build ${{github.workspace}}\zlib-git\build --config Release
146147 cmake --install ${{github.workspace}}\zlib-git\build --strip
147- mkdir D:\a\ff7tk\ff7tk\build\src\utils
148- copy "C:\zlib\bin\zlib.dll" D:\a\ff7tk\ff7tk\build\src\utils
149-
148+ - name : Update Windows Paths
149+ if : (runner.os == 'Windows')
150+ run : |
151+ echo "C:\zlib\bin\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
152+ echo "C:\Program Files\doxygen\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
153+ echo "C:\Program Files\Graphviz\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
150154 - name : Build ff7tk
151155 run : |
152156 ${{env.cmakeConfigure}} -DCPACK_PACKAGE_VERSION="${{ needs.precheck.outputs.version }}" -DCPACK_IFW_ROOT=${{matrix.config.Qt_TOOL_PATH}} ${{matrix.config.extraCmakeConfig}}
153157 cmake --build build --config ${{env.BuildType}} --target package
154- - name : Deploy Pages
158+ - name : Update Documentation
155159 if : runner.os == 'Linux' && github.ref == 'refs/heads/master'
156160 uses : JamesIves/github-pages-deploy-action@4.1.4
157161 with :
@@ -186,7 +190,7 @@ jobs:
186190 with :
187191 fetch-depth : 0
188192 - run : git fetch --tags --force
189- - uses : uraimo/run-on-arch-action@v2.2 .0
193+ - uses : uraimo/run-on-arch-action@v2.3 .0
190194 name : Build artifact
191195 with :
192196 arch : ${{ matrix.config.arch }}
0 commit comments