From c2f65cac121a25f865f4e8dda6e0b74b53a8aeaa Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 24 Jun 2021 09:47:49 -0500 Subject: [PATCH] Fix whitespace and trailing newline in github actions files. --- .github/scripts/build-macos.sh | 2 +- .github/scripts/sign-macos.sh | 6 +++--- .github/workflows/cd.yml | 2 +- .github/workflows/test.yml | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/scripts/build-macos.sh b/.github/scripts/build-macos.sh index 3394a8a..103b318 100755 --- a/.github/scripts/build-macos.sh +++ b/.github/scripts/build-macos.sh @@ -49,4 +49,4 @@ else if [ $(uname -m) = "$2" ]; then make -j$(sysctl -n hw.logicalcpu) test_solvespace fi -fi \ No newline at end of file +fi diff --git a/.github/scripts/sign-macos.sh b/.github/scripts/sign-macos.sh index 8e944d3..0580f74 100755 --- a/.github/scripts/sign-macos.sh +++ b/.github/scripts/sign-macos.sh @@ -72,12 +72,12 @@ do echo "Checking progress..." progress=$(xcrun altool --notarization-info "${notarize_uuid}" -u "${MACOS_APPSTORE_USERNAME}" -p "${MACOS_APPSTORE_APP_PASSWORD}" 2>&1) # echo "${progress}" - + if [ $? -ne 0 ] || [[ "${progress}" =~ "Invalid" ]] ; then echo "Error with notarization. Exiting" break fi - + if [[ "${progress}" =~ "success" ]]; then success=1 break @@ -88,4 +88,4 @@ do done # staple -xcrun stapler staple "${dmg}" \ No newline at end of file +xcrun stapler staple "${dmg}" diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index a14afc5..85f28aa 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -69,7 +69,7 @@ jobs: with: name: windows path: build/bin/RelWithDebInfo/solvespace.exe - + build_release_windows_openmp: needs: [test_ubuntu, test_windows, test_macos] name: Build Release Windows (OpenMP) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1ca64b3..7b66cdb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,3 +42,4 @@ jobs: run: .github/scripts/install-macos.sh ci - name: Build & Test run: .github/scripts/build-macos.sh debug arm64 && .github/scripts/build-macos.sh debug x86_64 +