diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0c81f1..f2144f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,48 +10,49 @@ jobs: build: runs-on: windows-latest steps: - - id: cache-proxinject - uses: actions/cache@v4 - with: - path: proxinject.build/release - key: ${{ runner.os }}-proxinject - - - if: steps.cache-proxinject.outputs.cache-hit != true - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: PragmaTwice/proxinject - path: proxinject.build fetch-depth: 0 - - if: steps.cache-proxinject.outputs.cache-hit != true - working-directory: proxinject.build + - name: Build proxinject run: | - ./build.ps1 -mode Release -arch x64 # build the project via CMake and msbuild + ./build.ps1 -mode Release -arch x64 - - uses: actions/checkout@v4 + - uses: actions/upload-artifact@v4 with: - path: main + name: proxinject-${{ github.sha }} + path: release + + pack: + runs-on: windows-latest + needs: build + steps: + - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: python-version: 3.12 - - working-directory: main + - uses: actions/download-artifact@v4 + with: + name: proxinject + merge-multiple: true + + - name: Pack mhmp run: | python -m pip install --upgrade pip python -m pip install -r requirements.txt python -m pip install pyinstaller pyinstaller --clean mhmp.spec - - - run: | - mv main/dist/mhmp ./ - mv proxinject.build/release mhmp/ - 7z a mhmp-${{ github.ref_name }}-win64.7z ./mhmp/ + #### + mv proxinject dist/mhmp/ + 7z a mhmp-${{ github.ref_name }}-win64.7z ./dist/mhmp/ - uses: actions/upload-artifact@v4 with: name: mhmp-${{ github.sha }} - path: mhmp + path: dist/mhmp - if: github.ref_type == 'tag' uses: softprops/action-gh-release@v2