Merge pull request #22 from hebasto/230915-each-commit

.github/workflows/ci.yml

@@ -29,16 +29,19 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 360  # Use maximum time, see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idtimeout-minutes. Assuming a worst case time of 1 hour per commit, this leads to a --max-count=6 below.
     env:
-      MAX_COUNT: '--max-count=6'
+      MAX_COUNT: 6
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: '8'  # Two more than $MAX_COUNT
-      - run: git checkout HEAD~  # Skip the top commit, because it is already checked by the other tasks.
+          fetch-depth: 8  # Two more than --max-count
+      - run: |
+          git checkout HEAD~  # Skip the top commit, because it is already checked by the other tasks.
+          echo "COMMIT_AFTER_LAST_MERGE=$(git log ^$(git log --merges -1 --format='%H') HEAD --format='%H' --max-count=${{ env.MAX_COUNT }} | tail -1)" >> "$GITHUB_ENV"
       - run: sudo apt install clang ccache build-essential libtool autotools-dev automake pkg-config bsdmainutils python3-zmq libevent-dev libboost-dev libsqlite3-dev libdb++-dev systemtap-sdt-dev libminiupnpc-dev libnatpmp-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools qtwayland5 libqrencode-dev -y
-      # Use clang++, because it is a bit faster and uses less memory than g++
-      - run: git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && ./autogen.sh && CC=clang CXX=clang++ ./configure && make clean && make -j $(nproc) check && ./test/functional/test_runner.py -j $(( $(nproc) * 2 ))" "$( git log '^'$( git log --merges -1 --format='%H' ) HEAD --format='%H' ${MAX_COUNT} | tail -1 )~1"
+      - name: Compile and run tests
+        run: |
+          # Use clang++, because it is a bit faster and uses less memory than g++
+          git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && ./autogen.sh && CC=clang CXX=clang++ ./configure && make clean && make -j $(nproc) check && ./test/functional/test_runner.py -j $(( $(nproc) * 2 ))" "${{ env.COMMIT_AFTER_LAST_MERGE }}~1"
 
   macos-native-x86_64:
     name: 'macOS 13 native, x86_64, no depends, sqlite only, gui'