From 1f366ee0730f752da263fd32d66ba6ec7306f195 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Sat, 23 May 2020 13:24:37 -0500 Subject: [PATCH] Change workflow to use wx313 branch --- .github/workflows/cmake_build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index b3dafbd8a..37dd40ed2 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -21,6 +21,7 @@ on: # env: WXURL: https://github.com/audacity/wxWidgets + WXREF: audacity-fixes-3.1.3 WXWIN: ${{ github.workspace }}/wxwin # @@ -75,7 +76,7 @@ jobs: set -x # Get latest wxWidgets commit hash - wxhash=$(git ls-remote ${WXURL} HEAD | awk 'NR==1 {print $1}') + wxhash=$(git ls-remote "${WXURL}" "${WXREF}" | awk 'NR==1 {print $1}') # Build the cache key wxhash="wx_${wxhash}_${RUNNER_OS}_${{matrix.config.platform}}" @@ -116,7 +117,7 @@ jobs: if [ ! -e "${WXWIN}" ] then # Clone the wxWidgets repo - git clone --depth 1 --recurse-submodules "${WXURL}" "wxroot" + git clone --depth 1 --recurse-submodules -b "${WXREF}" "${WXURL}" "wxroot" # Use cmake since it defines the MSVC enviornment for us cmake -S "wxroot" \ @@ -186,7 +187,7 @@ jobs: if [ ! -e "${WXWIN}" ] then # Clone the wxWidgets repo - git clone --depth 1 --recurse-submodules "${WXURL}" "wxroot" + git clone --depth 1 --recurse-submodules -b "${WXREF}" "${WXURL}" "wxroot" # Make sure our flags are included export CXX="g++ -std=c++1z -stdlib=libc++" @@ -261,7 +262,7 @@ jobs: if [ ! -e "${WXWIN}" ] then # Clone the wxWidgets repo - git clone --depth 1 --recurse-submodules "${WXURL}" "wxroot" + git clone --depth 1 --recurse-submodules -b "${WXREF}" "${WXURL}" "wxroot" # Install additional required package sudo apt-get install -y autoconf automake