Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force RPG build #69

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build_mod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # TODO: try removing this after the initial release
- name: validate gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: setup jdk ${{ matrix.java }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin' # is there a reason Fabric uses Microsoft?
Expand All @@ -36,7 +36,7 @@ jobs:
- name: build
run: ./gradlew build
- name: capture build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts
path: build/libs/
20 changes: 10 additions & 10 deletions .github/workflows/build_rpg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ on: # run on any push to the primary branch
pull_request:
push:
branches:
- 1.20.5
- 1.21.2

jobs:
test_and_build_rpg:
strategy:
matrix:
os: [ ubuntu-20.04, windows-2019, macos-11 ]
os: [ ubuntu-latest, windows-latest, macos-latest ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # TODO: try removing this after the initial release
- name: Set up Python 3.10
uses: actions/setup-python@v4
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: Cache ffmpeg binaries
id: cache-ffmpeg
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: ffmpeg-cache
with:
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
pyinstaller launcher.py --console --onefile -n FoxNapRPG --collect-all foxnap_rpg
- name: Cache integration test music
id: cache-music
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: music-cache
with:
Expand All @@ -99,15 +99,15 @@ jobs:
- name: Download music for integration test
if: ${{ steps.cache-music.outputs.cache-hit != 'true' }}
run: |
curl --create-dirs -JL "https://archive.org/compress/gustav-holst-the-planets-op.-32/formats=VBR%20MP3&file=/gustav-holst-the-planets-op.-32.zip" --output music/holst-the-planets.zip
curl --create-dirs -JL "https://openbagtwo.github.io/ThePlanets.zip" --output music/holst-the-planets.zip
- name: Extract integration test music
run: |
python -c "from zipfile import ZipFile; zip = ZipFile('music/holst-the-planets.zip'); zip.extractall('build/dist')"
- name: Run Integration Tests
run: |
python run_integration_tests.py build/dist/FoxNapRPG 7
- name: capture build artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: always()
with:
name: ResourcepackGenerator-${{ runner.os }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
# them.

name: lint
on: # so lightweight I have zero qualms about doing it on all branches
push:
on: # so lightweight I have zero qualms about doing it on all branches
push:

jobs:
lint-python:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v4
- uses: actions/checkout@v4
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: Install package and dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -25,6 +25,6 @@ jobs:
run: |
isort . --profile="black"
black foxnap_rpg
- name: Type check with mypy
run: |
mypy foxnap_rpg --exclude build
# - name: Type check with mypy
# run: |
# mypy foxnap_rpg --exclude build
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,8 @@ private static void playSound(World world, PlayerEntity player, SoundEvent sound
);
}

@Override
public int getMaxUseTime(ItemStack stack) {
return this.cooldown;
}
}
Loading