mirror of
https://github.com/archtechx/tenancy.git
synced 2026-02-05 15:54:03 +00:00
ci: try fixing retry logic, make makefile use cl on Windows
This commit is contained in:
parent
93fe982b12
commit
c5f187d2c7
2 changed files with 12 additions and 4 deletions
8
.github/workflows/extensions.yml
vendored
8
.github/workflows/extensions.yml
vendored
|
|
@ -57,9 +57,15 @@ jobs:
|
||||||
if: runner.os != 'Windows'
|
if: runner.os != 'Windows'
|
||||||
run: |
|
run: |
|
||||||
for attempt in {1..3}; do
|
for attempt in {1..3}; do
|
||||||
git pull --rebase && git push && break || sleep 5
|
git pull --rebase && git push && exit 0 || {
|
||||||
|
echo "Attempt $attempt failed. Retrying in 5 seconds..."
|
||||||
|
sleep 5
|
||||||
|
}
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo "Failed to push changes after 3 attempts."
|
||||||
|
exit 1
|
||||||
|
|
||||||
- name: Push files (Windows)
|
- name: Push files (Windows)
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
run: git pull --rebase && git push
|
run: git pull --rebase && git push
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,8 @@ OUTPUT :=
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
OUTPUT = lib/noattach.dll
|
OUTPUT = lib/noattach.dll
|
||||||
CCFLAGS = -shared
|
|
||||||
else
|
else
|
||||||
UNAME := $(shell uname)
|
UNAME := $(shell uname)
|
||||||
CCFLAGS = -fPIC -Os -shared
|
|
||||||
ifeq ($(UNAME),Darwin)
|
ifeq ($(UNAME),Darwin)
|
||||||
ifeq ($(shell uname -m),arm64)
|
ifeq ($(shell uname -m),arm64)
|
||||||
OUTPUT = lib/arm/noattach.dylib
|
OUTPUT = lib/arm/noattach.dylib
|
||||||
|
|
@ -32,5 +30,9 @@ headers:
|
||||||
cp sqlite-amalgamation-3470200/*.h .
|
cp sqlite-amalgamation-3470200/*.h .
|
||||||
|
|
||||||
$(OUTPUT): noattach.c
|
$(OUTPUT): noattach.c
|
||||||
|
ifeq ($(OS),Windows_NT)
|
||||||
|
cl /LD /Fe:$(OUTPUT) $<
|
||||||
|
else
|
||||||
# We don't link against libsqlite3 since PHP statically links its own libsqlite3.
|
# We don't link against libsqlite3 since PHP statically links its own libsqlite3.
|
||||||
$(CC) $(CCFLAGS) -o $@ $<
|
$(CC) -fPIC -Os -shared -o $@ $<
|
||||||
|
endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue