diff options
| author | dannye <33dannye@gmail.com> | 2026-01-17 22:38:33 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2026-01-17 22:38:33 -0600 |
| commit | bc2354dd6626ce28bb9561547ed2107cfa56c18e (patch) | |
| tree | 5902d4c3389253c76b7c3351e0d7dfecb551c28d /.github | |
| parent | Identify characters in `_OakSpeechText2B` and `Printer_GetMonStats.IDNo` (#144) (diff) | |
| parent | Use macros for `WildMonEncounterSlotChances` (#562) (diff) | |
| download | pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.tar.gz pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.tar.xz pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/checkdiff.sh | 8 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 71 |
2 files changed, 59 insertions, 20 deletions
diff --git a/.github/checkdiff.sh b/.github/checkdiff.sh new file mode 100755 index 00000000..430aba4d --- /dev/null +++ b/.github/checkdiff.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if ! git diff-index --quiet HEAD --; then + echo 'Uncommitted changes detected:' + git diff-index HEAD -- + return 1 +fi diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 51c2eab3..47b44da9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,25 +5,29 @@ on: branches: [ master ] pull_request: +env: + rgbds_version: v1.0.1 + jobs: build: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v6 - name: Checkout rgbds - uses: actions/checkout@master + uses: actions/checkout@v6 with: path: rgbds - ref: v1.0.0 + ref: ${{ env.rgbds_version }} repository: gbdev/rgbds - name: Install rgbds working-directory: rgbds run: | - sudo apt-get install -yq libpng-dev - sudo make install + sudo apt-get update + sudo apt-get install -yq bison libpng-dev pkg-config + sudo make -j$(nproc) install - name: Remove rgbds run: | @@ -33,21 +37,13 @@ jobs: if: ${{ github.repository_owner == 'pret' }} run: | make DEBUG=1 -j$(nproc) compare - if ! git diff-index --quiet HEAD --; then - echo 'Uncommitted changes detected:' - git diff-index HEAD -- - return 1 - fi + .github/checkdiff.sh - name: Make if: ${{ github.repository_owner != 'pret' }} run: | make -j$(nproc) - if ! git diff-index --quiet HEAD --; then - echo 'Uncommitted changes detected:' - git diff-index HEAD -- - return 1 - fi + .github/checkdiff.sh - name: Discord webhook if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }} @@ -57,22 +53,57 @@ jobs: .github/webhook.sh - name: Checkout symbols - if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }} + if: ${{ github.repository_owner == 'pret' && github.event_name == 'push' }} uses: actions/checkout@master with: path: symbols ref: symbols - name: Move symbols - if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }} + if: ${{ github.repository_owner == 'pret' && github.event_name == 'push' }} run: | - cp -v *.sym symbols/ - cp -v *.map symbols/ + cp -v *.sym *.map symbols/ - name: Update symbols - if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }} + if: ${{ github.repository_owner == 'pret' && github.event_name == 'push' }} uses: EndBug/add-and-commit@v9 with: cwd: "./symbols" add: "*.sym *.map" message: ${{ github.event.commits[0].message }} + + build-macos: + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v6 + + - name: Checkout rgbds + uses: actions/checkout@v6 + with: + path: rgbds + ref: ${{ env.rgbds_version }} + repository: gbdev/rgbds + + - name: Install rgbds + working-directory: rgbds + run: | + brew install bison libpng pkg-config + export PATH="$(brew --prefix bison)/bin:$PATH" + sudo make -j$(sysctl -n hw.ncpu) install + + - name: Remove rgbds + run: | + rm -rf rgbds + + - name: Compare + if: ${{ github.repository_owner == 'pret' }} + run: | + make DEBUG=1 -j$(sysctl -n hw.ncpu) compare + .github/checkdiff.sh + + - name: Make + if: ${{ github.repository_owner != 'pret' }} + run: | + make -j$(sysctl -n hw.ncpu) + .github/checkdiff.sh |