Skip to content

Commit

Permalink
Merge branch 'port' into port-net
Browse files Browse the repository at this point in the history
  • Loading branch information
fgsfdsfgs committed May 14, 2024
2 parents 9625cd7 + 865ca68 commit aba9834
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 10 deletions.
33 changes: 28 additions & 5 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
mingw-w64-i686-SDL2
mingw-w64-i686-zlib
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build pd.exe
run: make -f Makefile.port -j
- name: Prepare artifact for packaging
Expand All @@ -36,7 +36,7 @@ jobs:
cp /mingw32/bin/{SDL2.dll,zlib1.dll,libgcc_s_dw2-1.dll,libwinpthread-1.dll} bin/
touch bin/data/put_your_rom_here.txt
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pd-i686-windows
path: bin/
Expand All @@ -51,7 +51,7 @@ jobs:
sudo apt-get update
sudo apt-get install git gcc g++ gcc-multilib g++-multilib make libsdl2-dev zlib1g-dev libsdl2-dev:i386 zlib1g-dev:i386
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build pd.exe
run: make -f Makefile.port TARGET_PLATFORM=i686-linux -j2
- name: Prepare artifact for packaging
Expand All @@ -60,9 +60,32 @@ jobs:
cp build/ntsc-final-port/pd.exe bin/pd
touch bin/data/put_your_rom_here.txt
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pd-i686-linux
path: bin/
retention-days: 0


publish-latest-build:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/port'
needs: [build-i686-windows, build-i686-linux]
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
path: ci-artifacts
- name: Publish latest dev-build
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mkdir ci-release
pushd ci-artifacts
tar czf ../ci-release/pd-i686-linux.tar.gz pd-i686-linux
zip -r ../ci-release/pd-i686-windows.zip pd-i686-windows
popd
git tag --force ci-dev-build port
git push --force origin ci-dev-build
gh release upload --clobber ci-dev-build ci-release/*
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,10 @@ though you might have to install some additional libraries.

## Download

Latest [automatic builds](https://github.com/fgsfdsfgs/perfect_dark/actions) of the netplay branch for supported platforms:
* [i686-windows (`port-net`)](https://nightly.link/fgsfdsfgs/perfect_dark/workflows/c-cpp/port-net/pd-i686-windows.zip)
* [i686-linux (`port-net`)](https://nightly.link/fgsfdsfgs/perfect_dark/workflows/c-cpp/port-net/pd-i686-linux.zip)

If you are looking for netplay builds (the `port-net` branch), see [this link](https://github.com/fgsfdsfgs/perfect_dark/blob/port-net/README.md#download).
Latest [automatic builds](https://github.com/fgsfdsfgs/perfect_dark/releases/tag/ci-dev-build-net) of the netplay branch for supported platforms:
* [i686-windows (`port-net`)](https://github.com/fgsfdsfgs/perfect_dark/releases/download/ci-dev-build-net/pd-net-i686-windows.zip)
* [i686-linux (`port-net`)](https://github.com/fgsfdsfgs/perfect_dark/releases/download/ci-dev-build-net/pd-net-i686-linux.zip)
If you are looking for regular builds (the `port` branch), see [this link](https://github.com/fgsfdsfgs/perfect_dark/blob/port/README.md#download).

## Running

Expand Down

0 comments on commit aba9834

Please sign in to comment.