github: various fixes to workflows

commit 31227e6 Author: Adil Hanney <[email protected]> Date: Thu May 2 08:20:02 2024 +0100 github: use gnu grep on macos commit de1535f Author: Adil Hanney <[email protected]> Date: Thu May 2 08:01:42 2024 +0100 github: fix grep text encoding on windows commit 516b918 Author: Adil Hanney <[email protected]> Date: Thu May 2 07:59:29 2024 +0100 github: install codemagic cli with pipx commit 1d5c80f Author: Adil Hanney <[email protected]> Date: Thu May 2 07:54:33 2024 +0100 github: install codemagic cli with pipx
saber-notes · May 2, 2024 · 5721e01 · 5721e01
1 parent f3bd769
commit 5721e01
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -62,7 +62,9 @@ jobs:
           architecture: x64
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools
+        run: |
+          brew install pipx
+          pipx install codemagic-cli-tools
 
       - name: Setup keychain
         run: |
@@ -82,7 +84,6 @@ jobs:
       - run: find . -name "Podfile" -execdir pod install \;
 
       - name: Build for iOS
-        id: build
         run: |
           flutter build ipa \
             --dart-define=FLAVOR="App Store" \
@@ -91,7 +92,11 @@ jobs:
             --dart-define=DIRTY="false" \
             --export-options-plist=$HOME/export_options.plist
 
-          buildName=$(grep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
+      - name: Move IPA
+        id: move
+        run: |
+          brew install grep
+          buildName=$(ggrep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
           export ipaPath="Saber_v${buildName}.ipa"
           mv $(find $(pwd) -name "*.ipa") $ipaPath
           echo "ipaPath=$ipaPath" >> $GITHUB_OUTPUT
@@ -104,8 +109,8 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Saber-iOS-Archive
-          path: ${{ steps.build.outputs.ipaPath }}
+          path: ${{ steps.move.outputs.ipaPath }}
 
       - name: Publish to App Store
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        run: app-store-connect publish --path ${{ steps.build.outputs.ipaPath }}
+        run: app-store-connect publish --path ${{ steps.move.outputs.ipaPath }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -62,7 +62,9 @@ jobs:
           architecture: x64
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools
+        run: |
+          brew install pipx
+          pipx install codemagic-cli-tools
 
       - name: Setup keychain
         run: |
@@ -124,7 +126,8 @@ jobs:
       - name: Compress macOS build
         id: compress
         run: |
-          buildName=$(grep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
+          brew install grep
+          buildName=$(ggrep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
           zipName="Saber_v${buildName}.app.zip"
           echo "zipName=$zipName" >> $GITHUB_OUTPUT
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -76,6 +76,7 @@ jobs:
         id: rename
         shell: bash
         run: |
+          export LC_ALL=en_US.utf8
           buildName=$(grep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
           installerName="SaberInstaller_v${buildName}.exe"
           echo "installerName=$installerName" >> $GITHUB_OUTPUT