diff --git a/.github/workflows/l4d2-build.yml b/.github/workflows/l4d2-build.yml index 33638ad..45be552 100644 --- a/.github/workflows/l4d2-build.yml +++ b/.github/workflows/l4d2-build.yml @@ -45,7 +45,7 @@ jobs: echo "GITHUB_SHA_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV - name: Install (Linux) - if: runner.os == 'Linux' + if: startsWith(runner.os, 'Linux') run: | sudo dpkg --add-architecture i386 sudo apt-get update @@ -54,59 +54,53 @@ jobs: echo "CXX=clang++" >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) - if: runner.os == 'Windows' - uses: microsoft/setup-msbuild@v1.0.2 + if: startsWith(runner.os, 'Windows') + uses: microsoft/setup-msbuild@v1.1 - name: Install (Windows) - if: runner.os == 'Windows' + if: startsWith(runner.os, 'Windows') shell: cmd run: | :: See https://github.com/microsoft/vswhere/wiki/Find-VC for /f "usebackq delims=*" %%i in (`vswhere -latest -property installationPath`) do ( call "%%i"\Common7\Tools\vsdevcmd.bat -arch=x86 -host_arch=x64 ) - :: Loop over all environment variables and make them global. for /f "delims== tokens=1,2" %%a in ('set') do ( echo>>"%GITHUB_ENV%" %%a=%%b ) - name: Checking out MM:Source - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: alliedmodders/metamod-source ref: ${{ matrix.mm_branch }} path: metamod-${{ matrix.mm_version }} - - name: Checking out AMBuild - uses: actions/checkout@v2 - with: - repository: Accelerator74/ambuild - path: ambuild - - name: Setting up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.x' - name: Setting up ambuild - working-directory: ambuild - run: python setup.py install + run: | + python -m pip install wheel + pip install git+https://github.com/accelerator74/ambuild - name: Checking out hl2sdk-l4d2 - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: alliedmodders/hl2sdk ref: l4d2 path: hl2sdk-l4d2 - name: Checking out own repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - path: l4dtoolz + path: src - - name: Compiling L4DToolZ files - working-directory: l4dtoolz + - name: Compiling ${{ github.event.repository.name }} files + working-directory: src run: | mkdir build cd build @@ -114,7 +108,7 @@ jobs: ambuild - name: Uploading package - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: L4DToolZ-l4d2-${{ env.GITHUB_SHA_SHORT }} - path: l4dtoolz/build/package + path: src/build/package \ No newline at end of file diff --git a/.github/workflows/l4d_build.yml b/.github/workflows/l4d_build.yml index 6566b26..2d88346 100644 --- a/.github/workflows/l4d_build.yml +++ b/.github/workflows/l4d_build.yml @@ -45,7 +45,7 @@ jobs: echo "GITHUB_SHA_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV - name: Install (Linux) - if: runner.os == 'Linux' + if: startsWith(runner.os, 'Linux') run: | sudo dpkg --add-architecture i386 sudo apt-get update @@ -54,59 +54,53 @@ jobs: echo "CXX=clang++" >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) - if: runner.os == 'Windows' - uses: microsoft/setup-msbuild@v1.0.2 + if: startsWith(runner.os, 'Windows') + uses: microsoft/setup-msbuild@v1.1 - name: Install (Windows) - if: runner.os == 'Windows' + if: startsWith(runner.os, 'Windows') shell: cmd run: | :: See https://github.com/microsoft/vswhere/wiki/Find-VC for /f "usebackq delims=*" %%i in (`vswhere -latest -property installationPath`) do ( call "%%i"\Common7\Tools\vsdevcmd.bat -arch=x86 -host_arch=x64 ) - :: Loop over all environment variables and make them global. for /f "delims== tokens=1,2" %%a in ('set') do ( echo>>"%GITHUB_ENV%" %%a=%%b ) - name: Checking out MM:Source - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: alliedmodders/metamod-source ref: ${{ matrix.mm_branch }} path: metamod-${{ matrix.mm_version }} - - name: Checking out AMBuild - uses: actions/checkout@v2 - with: - repository: Accelerator74/ambuild - path: ambuild - - name: Setting up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.x' - name: Setting up ambuild - working-directory: ambuild - run: python setup.py install + run: | + python -m pip install wheel + pip install git+https://github.com/accelerator74/ambuild - name: Checking out hl2sdk-l4d - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: alliedmodders/hl2sdk ref: l4d path: hl2sdk-l4d - name: Checking out own repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - path: l4dtoolz + path: src - - name: Compiling L4DToolZ files - working-directory: l4dtoolz + - name: Compiling ${{ github.event.repository.name }} files + working-directory: src run: | mkdir build cd build @@ -114,7 +108,7 @@ jobs: ambuild - name: Uploading package - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: L4DToolZ-l4d-${{ env.GITHUB_SHA_SHORT }} - path: l4dtoolz/build/package + path: src/build/package \ No newline at end of file