diff options
| author | sfan5 <sfan5@live.de> | 2022-07-21 20:51:02 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2022-07-23 22:27:19 +0200 |
| commit | 175e13257653b07df247422cebd3a6da5f29dc51 (patch) | |
| tree | bc54d00708cab401c0f6123c45ab5b779487aaf0 /.github | |
| parent | 71f6a5f44e0cb0e4ef57e942987ec8e76139452c (diff) | |
| download | minetest-175e13257653b07df247422cebd3a6da5f29dc51.tar.gz minetest-175e13257653b07df247422cebd3a6da5f29dc51.tar.bz2 minetest-175e13257653b07df247422cebd3a6da5f29dc51.zip | |
Centralize IrrlichtMt version used for builds
maybe a submodule would have really been easier...
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c45743284..d578c3d9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -226,11 +226,9 @@ jobs: - uses: actions/checkout@v3 - name: Checkout IrrlichtMt - uses: actions/checkout@v3 - with: - repository: minetest/irrlicht - path: lib/irrlichtmt/ - ref: "1.9.0mt7" + run: | + $ref = @(Get-Content misc\irrlichtmt_tag.txt) + git clone https://github.com/minetest/irrlicht lib\irrlichtmt --depth 1 -b $ref[0] - name: Restore from cache and run vcpkg uses: lukka/run-vcpkg@v7 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7f0318c76..038765494 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,7 +22,6 @@ on: - '.github/workflows/macos.yml' env: - IRRLICHT_TAG: 1.9.0mt7 MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git MINETEST_GAME_BRANCH: master MINETEST_GAME_NAME: minetest_game @@ -43,8 +42,7 @@ jobs: - name: Build run: | git clone -b $MINETEST_GAME_BRANCH $MINETEST_GAME_REPO games/$MINETEST_GAME_NAME - rm -rvf games/$MINETEST_GAME_NAME/.git - git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt + git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt) mkdir build cd build cmake .. \ |