diff --git a/.github/workflows/track_minetest.yml b/.github/workflows/track_minetest.yml index 3698400..a133c7c 100644 --- a/.github/workflows/track_minetest.yml +++ b/.github/workflows/track_minetest.yml @@ -20,7 +20,7 @@ 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 @@ -28,7 +28,7 @@ jobs: 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 }} @@ -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' }} @@ -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 @@ -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' diff --git a/irrlicht.rev b/irrlicht.rev deleted file mode 100644 index b9699b4..0000000 --- a/irrlicht.rev +++ /dev/null @@ -1 +0,0 @@ -7173c2c62997b6416f17b90f9a50bff11fef1c4c diff --git a/minetest.rev b/minetest.rev index 98e8c0d..421376d 100644 --- a/minetest.rev +++ b/minetest.rev @@ -1 +1 @@ -b23042839b849562afecf83f337197764a9485bc +dummy diff --git a/push-revs.sh b/push-revs.sh index 6e0edfb..135d9ab 100755 --- a/push-revs.sh +++ b/push-revs.sh @@ -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 diff --git a/update-revs.sh b/update-revs.sh index 3c42a50..8eb5b5f 100755 --- a/update-revs.sh +++ b/update-revs.sh @@ -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