ci: Pull Matchfile info from secrets

ci: try pulling env vars into the matchfile

Author: Ron de las Alas

.github/workflows/ci-cd.yml

@@ -17,16 +17,15 @@ jobs:
       matrix:
         os:
           - macos-latest
-          - windows-latest
+          # - windows-latest
     runs-on: ${{ matrix.os }}
     defaults:
       run:
         shell: bash
     environment:
       name: ${{ matrix.os }}
     env:
-        SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'main' }}
-        MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+        SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'gha' }}
         AC_USERNAME: ${{ github.ref_name == 'main' && secrets.AC_USERNAME }}
         AC_PASSWORD: ${{ github.ref_name == 'main' && secrets.AC_PASSWORD }}
     steps:
@@ -59,7 +58,11 @@ jobs:
         with:
             ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }}
       - name: Fastlane
-        if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == true
+        env:
+            GIT_URL: ${{ secrets.FL_GIT_URL }}
+            STORAGE_MODE: ${{secrets.FL_STORAGE_MODE}}
+            MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+        if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == 'true'
         run: fastlane circleci
       - name: Build
         timeout-minutes: 30 # macOS notarization can take a while
@@ -73,7 +76,7 @@ jobs:
           PYTHON_PATH: ${{ matrix.os == 'macos-latest' && '/Users/runner/.pyenv/versions/2.7.18/bin/python'}}
         run: npm run ${{ env.SCRATCH_SHOULD_SIGN == true && 'dist' || 'distDev' }}
       - name: Zip MAS-Dev build
-        if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == true
+        if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == 'true'
         run: |
           NPM_APP_VERSION="`node -pe "require('./package.json').version"`"
           cd dist/mas-dev

.gitignore

@@ -27,7 +27,7 @@ npm-*
 /locale
 
 # Fastlane
-# **/fastlane/Matchfile
+## **/fastlane/Matchfile
 **/fastlane/report.xml
 **/fastlane/Preview.html
 **/fastlane/screenshots

fastlane/Matchfile

@@ -1,5 +1,5 @@
-git_url("[email protected]:scratchfoundation/scratch-fastlane-match-files.git")
-storage_mode("git")
+git_url(ENV.fetch("GIT_URL"))
+storage_mode(ENV.fetch("STORAGE_MODE"))
 type("development") # The default type, can be: appstore, adhoc, enterprise or development
 # app_identifier(["tools.fastlane.app", "tools.fastlane.app2"])
 # username("[email protected]") # Your Apple Developer Portal username