Skip to content

Commit

Permalink
Stop tracking Irrlicht; newer OS version
Browse files Browse the repository at this point in the history
  • Loading branch information
sfan5 committed May 15, 2024
1 parent 4c3dec2 commit 398ccf3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 21 deletions.
21 changes: 7 additions & 14 deletions .github/workflows/track_minetest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ permissions:
jobs:
# Current gcc version
update_repo:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
# Check out this repo
- uses: actions/checkout@v4
- name: Update minetest revision
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
./update-revs.sh # sets MINETEST_REV, IRRLICHT_REV
./update-revs.sh # sets MINETEST_REV
./push-revs.sh # sets DID_PUSH
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -39,19 +39,12 @@ jobs:
repository: '${{ github.repository_owner }}/minetest'
ref: ${{ env.MINETEST_REV }}
path: 'minetest'
# Checkout irrlicht
- uses: actions/checkout@v4
if: ${{ env.DID_PUSH == 'true' }}
with:
repository: '${{ github.repository_owner }}/irrlicht'
ref: ${{ env.IRRLICHT_REV }}
path: 'minetest/lib/irrlichtmt'
- name: Install deps
if: ${{ env.DID_PUSH == 'true' }}
run: |
pushd minetest
source ./util/ci/common.sh --no-irr
install_linux_deps g++-10
source ./util/ci/common.sh
install_linux_deps g++-12
popd
- name: Build
if: ${{ env.DID_PUSH == 'true' }}
Expand All @@ -60,8 +53,8 @@ jobs:
./util/ci/build.sh
popd
env:
CC: gcc-10
CXX: g++-10
CC: gcc-12
CXX: g++-12
CMAKE_BUILD_TYPE: "Release"
CMAKE_BUILD_SERVER: FALSE
CMAKE_ENABLE_GETTEXT: FALSE
Expand All @@ -75,7 +68,7 @@ jobs:
# gh-pages branch is updated and pushed automatically with extracted benchmark data
- name: Store benchmark result
if: ${{ env.DID_PUSH == 'true' }}
uses: benchmark-action/github-action-benchmark@3d3bca03e83647895ef4f911fa57de3c7a391aaf
uses: benchmark-action/github-action-benchmark@1846227a307d8c0149b960b986d46f8f4c95db0c
with:
name: Minetest Performance Benchmarks
tool: 'catch2'
Expand Down
1 change: 0 additions & 1 deletion irrlicht.rev

This file was deleted.

2 changes: 1 addition & 1 deletion minetest.rev
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b23042839b849562afecf83f337197764a9485bc
dummy
3 changes: 1 addition & 2 deletions push-revs.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#!/bin/bash -eu

MINETEST_REV=`cat minetest.rev`
IRRLICHT_REV=`cat irrlicht.rev`

if ! git diff-index --quiet --cached HEAD ; then
echo "Update detected. Pushing changes"
git commit -m "Minetest: ${MINETEST_REV} | Irrlicht: ${IRRLICHT_REV}"
git commit -m "Minetest: ${MINETEST_REV}"
git push "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
DID_PUSH=true
else
Expand Down
4 changes: 1 addition & 3 deletions update-revs.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
#!/bin/bash -eux

git ls-remote "https://github.com/${GITHUB_REPOSITORY_OWNER}/minetest" refs/heads/master | awk '{print $1}' > minetest.rev
git ls-remote "https://github.com/${GITHUB_REPOSITORY_OWNER}/irrlicht" refs/heads/master | awk '{print $1}' > irrlicht.rev

git add minetest.rev irrlicht.rev
git add minetest.rev

if [ -n "${GITHUB_ENV:-}" ]; then
echo "MINETEST_REV=$(cat minetest.rev)" >> "$GITHUB_ENV"
echo "IRRLICHT_REV=$(cat irrlicht.rev)" >> "$GITHUB_ENV"
fi

0 comments on commit 398ccf3

Please sign in to comment.