From 8bf408500a7e3f820ce28559da4b7e936efe1b69 Mon Sep 17 00:00:00 2001
From: Jose Quintana <joseluisquintana20@gmail.com>
Date: Fri, 21 Jan 2022 23:28:14 +0100
Subject: [PATCH] chore: stable rust for some pipelines

---
 .github/workflows/devel.yml   | 22 +++++++++++-----------
 .github/workflows/release.yml | 28 +++++++++-------------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/devel.yml b/.github/workflows/devel.yml
index 9664e95..c5f7d62 100644
--- a/.github/workflows/devel.yml
+++ b/.github/workflows/devel.yml
@@ -5,7 +5,7 @@ on:
     branches:
     - 1.x
   schedule:
-  - cron: '00 01 * * *'
+  - cron: '00 04 * * *'
 
 jobs:
   test:
@@ -37,7 +37,7 @@ jobs:
         include:
         - build: pinned
           os: ubuntu-20.04
-          rust: 1.56.0
+          rust: 1.58.1
         - build: stable
           os: ubuntu-20.04
           rust: stable
@@ -46,7 +46,7 @@ jobs:
           rust: beta
         - build: linux-musl
           os: ubuntu-20.04
-          rust: nightly
+          rust: stable
           target: x86_64-unknown-linux-musl
         - build: linux-musl-arm64
           os: ubuntu-20.04
@@ -54,31 +54,31 @@ jobs:
           target: aarch64-unknown-linux-musl
         - build: linux-gnu
           os: ubuntu-20.04
-          rust: nightly
+          rust: stable
           target: x86_64-unknown-linux-gnu
         - build: linux-gnu-arm64
           os: ubuntu-20.04
-          rust: nightly
+          rust: stable
           target: aarch64-unknown-linux-gnu
         - build: linux-arm-gnueabihf
           os: ubuntu-20.04
           rust: nightly
           target: arm-unknown-linux-gnueabihf
         - build: macos
-          os: macos-latest
-          rust: nightly
+          os: macos-11
+          rust: stable
           target: x86_64-apple-darwin
         - build: macos-arm64
-          os: macos-latest
-          rust: nightly
+          os: macos-11
+          rust: stable
           target: aarch64-apple-darwin
         - build: windows-msvc
           os: windows-2019
-          rust: nightly
+          rust: stable
           target: x86_64-pc-windows-msvc
         - build: windows-msvc-arm64
           os: windows-2019
-          rust: nightly
+          rust: stable
           target: aarch64-pc-windows-msvc
 
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fc888f3..57d75a1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
         include:
         - build: linux-musl
           os: ubuntu-20.04
-          rust: nightly
+          rust: stable
           target: x86_64-unknown-linux-musl
         - build: linux-musl-arm64
           os: ubuntu-20.04
@@ -69,31 +69,31 @@ jobs:
           target: aarch64-unknown-linux-musl
         - build: linux-gnu
           os: ubuntu-20.04
-          rust: nightly
+          rust: stable
           target: x86_64-unknown-linux-gnu
         - build: linux-gnu-arm64
           os: ubuntu-20.04
-          rust: nightly
+          rust: stable
           target: aarch64-unknown-linux-gnu
         - build: linux-arm-gnueabihf
           os: ubuntu-20.04
           rust: nightly
           target: arm-unknown-linux-gnueabihf
         - build: macos
-          os: macos-latest
-          rust: nightly
+          os: macos-11
+          rust: stable
           target: x86_64-apple-darwin
         - build: macos-arm64
-          os: macos-latest
-          rust: nightly
+          os: macos-11
+          rust: stable
           target: aarch64-apple-darwin
         - build: windows-msvc
           os: windows-2019
-          rust: nightly
+          rust: stable
           target: x86_64-pc-windows-msvc
         - build: windows-msvc-arm64
           os: windows-2019
-          rust: nightly
+          rust: stable
           target: aarch64-pc-windows-msvc
 
     steps:
@@ -124,16 +124,6 @@ jobs:
         echo "target flag is: ${{ env.TARGET_FLAGS }}"
         echo "target dir is: ${{ env.TARGET_DIR }}"
 
-    - name: aarch64 specific items
-      if: matrix.build == 'macos-arm64'
-      run: |
-        # Use the beta compiler
-        sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/
-
-        # Set SDK environment variables
-        echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV
-        echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV
-
     - name: Build release binary
       run: ${{ env.CARGO }} build --verbose --release ${{ env.TARGET_FLAGS }}
 
--
libgit2 1.7.2