From f032b452fb2da4000592589172f926122e04924c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 2 Jan 2025 06:11:19 +0100 Subject: [PATCH] ci: fix workflow on windows, fix makefile --- .github/workflows/extensions.yml | 10 +++++++++- extensions/Makefile | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/extensions.yml b/.github/workflows/extensions.yml index 00d53a59..b5ad2afe 100644 --- a/.github/workflows/extensions.yml +++ b/.github/workflows/extensions.yml @@ -51,7 +51,15 @@ jobs: git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" git add lib/ - git commit -m "Auto-build: Update output files [skip ci]" || echo "No changes to commit" + git commit -m "Auto-build: Update extensions [skip ci]" || echo "No changes to commit" + + - name: Push files (Unix) + if: runner.os != 'Windows' + run: | for attempt in {1..3}; do git pull --rebase && git push && break || sleep 5 done + + - name: Push files (Windows) + if: runner.os == 'Windows' + run: git pull --rebase && git push diff --git a/extensions/Makefile b/extensions/Makefile index b84af00b..6d31c487 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -1,5 +1,7 @@ .PHONY: all headers +OUTPUT := + ifeq ($(OS),Windows_NT) OUTPUT = lib/noattach.dll CCFLAGS = -shared