From 21c1fce988e63b5ccf8fd537e02bfbbbf2ce6703 Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Sat, 10 Feb 2024 12:34:19 -0400 Subject: [PATCH] CI: pull from 11.x branches of dependency repositories --- .github/workflows/main.yml | 7 ++++--- extra/appveyor/appveyor.yml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e96663d2..49e346b29 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,7 @@ jobs: uses: actions/checkout@v3 with: repository: love2d/love-appimage-source + ref: 11.x - name: Checkout LÖVE uses: actions/checkout@v3 with: @@ -59,7 +60,7 @@ jobs: with: path: megasource repository: love2d/megasource - ref: main + ref: 11.x - name: Checkout uses: actions/checkout@v3 with: @@ -92,7 +93,7 @@ jobs: with: path: apple-dependencies repository: love2d/love-apple-dependencies - ref: main + ref: 11.x - name: Move Dependencies run: mv apple-dependencies/macOS/Frameworks platform/xcode/macosx @@ -120,7 +121,7 @@ jobs: with: path: apple-dependencies repository: love2d/love-apple-dependencies - ref: main + ref: 11.x - name: Move Dependencies run: | mv apple-dependencies/iOS/libraries platform/xcode/ios diff --git a/extra/appveyor/appveyor.yml b/extra/appveyor/appveyor.yml index 5e29cc30e..1da366784 100644 --- a/extra/appveyor/appveyor.yml +++ b/extra/appveyor/appveyor.yml @@ -26,7 +26,7 @@ install: - for /D %%i in (*) do @if "%%i" NEQ "love" @move %%i love\%%i - for %%i in (*) do @if "%%i" NEQ "appveyor.yml" @move %%i love\%%i # clone megasource and move into top directory. -- git clone --depth 1 https://github.com/love2d/megasource.git megasource +- git clone -b 11.x --depth 1 https://github.com/love2d/megasource.git megasource - cd megasource - for /D %%i in (*) do @move %%i ..\%%i - for %%i in (*) do @move %%i ..\%%i