scratchfoundation/scratch-desktop
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-desktop.git synced 2025-07-04 08:30:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions3

ci: Pull Matchfile info from secrets

Browse source 
ci: try pulling env vars into the matchfile
This commit is contained in:
Ron de las Alas 2023-11-29 14:17:27 -05:00
parent 8b506506ff
commit 4fb01893d1
3 changed files with 11 additions and 8 deletions
.github/workflows
ci-cd.yml
.gitignore
fastlane
Matchfile

13
.github/workflows/ci-cd.yml vendored
View file

@ -17,7 +17,7 @@ jobs:
matrix: matrix:
os: os:
- macos-latest - macos-latest
- windows-latest # - windows-latest
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
defaults: defaults:
run: run:
@ -25,8 +25,7 @@ jobs:
environment: environment:
name: ${{ matrix.os }} name: ${{ matrix.os }}
env: env:
SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'main' }} SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'gha' }}
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
AC_USERNAME: ${{ github.ref_name == 'main' && secrets.AC_USERNAME }} AC_USERNAME: ${{ github.ref_name == 'main' && secrets.AC_USERNAME }}
AC_PASSWORD: ${{ github.ref_name == 'main' && secrets.AC_PASSWORD }} AC_PASSWORD: ${{ github.ref_name == 'main' && secrets.AC_PASSWORD }}
steps: steps:
@ -59,7 +58,11 @@ jobs:
with: with:
ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }} ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }}
- name: Fastlane - 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 run: fastlane circleci
- name: Build - name: Build
timeout-minutes: 30 # macOS notarization can take a while 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'}} 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' }} run: npm run ${{ env.SCRATCH_SHOULD_SIGN == true && 'dist' || 'distDev' }}
- name: Zip MAS-Dev build - 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: | run: |
NPM_APP_VERSION="`node -pe "require('./package.json').version"`" NPM_APP_VERSION="`node -pe "require('./package.json').version"`"
cd dist/mas-dev cd dist/mas-dev

2
.gitignore vendored
View file

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

4
fastlane/Matchfile
View file

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