From 842b2beda05c561fd988d9f654b2ff9552d49c3a Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 29 Jul 2024 16:34:39 +0200 Subject: [PATCH 1/6] Bump artifact-related actions to v4 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb1ff62..ee1d6ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,7 +146,7 @@ jobs: TARGET_PLATFORM: ${{ matrix.targetPlatform }} TARGET_ARCH: ${{ matrix.arch }} - name: Upload output artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dugite-native-${{ matrix.targetPlatform }}-${{ matrix.arch }}-output @@ -164,7 +164,7 @@ jobs: - uses: actions/checkout@v4 - name: Download all artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: './artifacts' From 983981530d2daa658145c580a02f5c7b9e1d8393 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 12 Aug 2024 09:12:42 +0200 Subject: [PATCH 2/6] Don't use Ubuntu 18.04 to build Dugite for Linux --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee1d6ff..c1e82b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,6 @@ jobs: build: name: ${{ matrix.friendlyName }} ${{ matrix.arch }} runs-on: ${{ matrix.os }} - container: ${{ matrix.image }} strategy: fail-fast: false matrix: @@ -42,17 +41,14 @@ jobs: - os: ubuntu-20.04 friendlyName: Linux targetPlatform: ubuntu - image: ubuntu:18.04 - os: ubuntu-20.04 friendlyName: Linux targetPlatform: ubuntu arch: arm64 - image: ubuntu:18.04 - os: ubuntu-20.04 friendlyName: Linux targetPlatform: ubuntu arch: arm - image: ubuntu:18.04 exclude: - os: macos-11 arch: x86 From a67e79278f1e7f5939be817df6627af8567f655b Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 12 Aug 2024 12:30:54 +0200 Subject: [PATCH 3/6] Remember to sudo :sweat_drops: apt --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1e82b6..ea58abb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,8 +59,8 @@ jobs: run: | # ubuntu dockerfile is very minimal (only 122 packages are installed) # add dependencies expected by scripts - apt update - apt install -y software-properties-common lsb-release sudo wget curl build-essential jq autoconf automake pkg-config ca-certificates + sudo apt update + sudo apt install -y software-properties-common lsb-release sudo wget curl build-essential jq autoconf automake pkg-config ca-certificates # install new enough git to run actions/checkout sudo add-apt-repository ppa:git-core/ppa -y sudo apt update From 64e14763b73c3df3709ff7652ca59125ded8e039 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 12 Aug 2024 17:12:57 +0200 Subject: [PATCH 4/6] Bump macos runners --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea58abb..f757f87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,13 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-11, windows-2019, ubuntu-20.04] + os: [macos-14, windows-2019, ubuntu-20.04] arch: [x86, x64] include: - - os: macos-11 + - os: macos-14 friendlyName: macOS targetPlatform: macOS - - os: macos-11 + - os: macos-14 friendlyName: macOS targetPlatform: macOS arch: arm64 @@ -50,7 +50,7 @@ jobs: targetPlatform: ubuntu arch: arm exclude: - - os: macos-11 + - os: macos-14 arch: x86 timeout-minutes: 20 steps: From f36f9cf16ffe28612341176a25ae409212ef6dcb Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 12 Aug 2024 17:15:00 +0200 Subject: [PATCH 5/6] Maybe macos-12? --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f757f87..eff10a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,13 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-14, windows-2019, ubuntu-20.04] + os: [macos-12, windows-2019, ubuntu-20.04] arch: [x86, x64] include: - - os: macos-14 + - os: macos-12 friendlyName: macOS targetPlatform: macOS - - os: macos-14 + - os: macos-12 friendlyName: macOS targetPlatform: macOS arch: arm64 @@ -50,7 +50,7 @@ jobs: targetPlatform: ubuntu arch: arm exclude: - - os: macos-14 + - os: macos-12 arch: x86 timeout-minutes: 20 steps: From 742643419de6f584d484c3b236104336275fa027 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 12 Aug 2024 17:16:27 +0200 Subject: [PATCH 6/6] Use oldest Xcode possible (13.1) --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eff10a4..8e98a3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,11 +70,11 @@ jobs: sudo apt-get install -y nodejs # avoid "fatal: detected dubious ownership in repository at '/__w/dugite-native/dugite-native'" error git config --global --add safe.directory '*' - # We need to use Xcode 11.7 for maximum compatibility with older macOS (x64) - - name: Switch to Xcode 11.7 + # We need to use Xcode 13.1 for maximum compatibility with older macOS (x64) + - name: Switch to Xcode 13.1 if: matrix.targetPlatform == 'macOS' && matrix.arch == 'x64' run: | - sudo xcode-select -s /Applications/Xcode_11.7.app/Contents/Developer/ + sudo xcode-select -s /Applications/Xcode_13.1.app/Contents/Developer/ # Delete the command line tools to make sure they don't get our builds # messed up with macOS SDK 11 stuff. sudo rm -rf /Library/Developer/CommandLineTools