From 3bd6604c0cd9bb0ae8d4bad44851cf2cc8b37d08 Mon Sep 17 00:00:00 2001 From: AntoineGautier Date: Wed, 17 Jul 2024 12:01:34 +0200 Subject: [PATCH] Fix GH action to stage Ubuntu binaries --- .github/workflows/cmake.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 4cfcf81..4a3a84c 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -73,7 +73,6 @@ jobs: - name: Stage binaries if: | - contains(matrix.os, 'latest') && contains(matrix.python-version, '3.9') && github.event_name == 'push' && github.ref == 'refs/heads/master' @@ -83,14 +82,14 @@ jobs: - name: Push Linux & macOS binaries if: | - (contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')) && + (contains(matrix.os, 'ubuntu') || matrix.os == 'macos-latest') && contains(matrix.python-version, '3.9') && github.event_name == 'push' && github.ref == 'refs/heads/master' run: | git config --global user.name "${GH_USERNAME}" git config --global user.email "${GH_USERNAME}@users.noreply.github.com" - git diff-index --quiet HEAD || { git commit -m "Add ${{ matrix.os }} binaries" && git pull && git push --allow-empty; } + git diff-index --quiet HEAD || { git commit -m "Add ${{ matrix.os }} binaries" && git pull && git push; } # We use cmd /c because powershell <7 does not support chain operators. - name: Push Windows binaries @@ -102,4 +101,4 @@ jobs: run: | git config --global user.name "${{ env.GH_USERNAME }}" git config --global user.email "${{ env.GH_USERNAME }}@users.noreply.github.com" - cmd /c 'git diff-index --quiet HEAD || ( git commit -m "Add ${{ matrix.os }} binaries" && git pull && git push --allow-empty )' + cmd /c 'git diff-index --quiet HEAD || ( git commit -m "Add ${{ matrix.os }} binaries" && git pull && git push )'