Skip to content

Commit

Permalink
ci: Configure python 2.7 to so runner is compatible with electron build
Browse files Browse the repository at this point in the history
  • Loading branch information
Ron de las Alas committed Nov 27, 2023
1 parent 6adafd7 commit 4d15309
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,13 @@ jobs:
run: npm ci
- name: Test
run: npm run test
- name: Install Python 2.7
if: matrix.os == 'macos-latest'
run: |
brew install pyenv
pyenv install 2.7.18
- name: Setup Keys for Fastlane
if: matrix.os == 'macos-latest'
uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }}
Expand All @@ -65,6 +71,7 @@ jobs:
# macOS CSC info was set by Fastlane above
WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
PYTHON_PATH: /Users/runner/.pyenv/versions/2.7.18/bin/python
run: npm run ${{ vars.SCRATCH_SHOULD_SIGN && 'dist' || 'distDev' }}
- name: Zip MAS-Dev build
if: matrix.os == 'macos-latest'
Expand All @@ -74,7 +81,7 @@ jobs:
ditto -v -c -k --sequesterRsrc --keepParent --zlibCompressionLevel 9 \
Scratch*.app ../mas-dev-${NPM_APP_VERSION}.zip
- name: Upload macOS artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: matrix.os == 'macos-latest'
with:
name: macOS
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"repository": {
"type": "git",
"url": "git+ssh://[email protected]/LLK/scratch-desktop.git"
"url": "git+ssh://[email protected]/scratchfoundation/scratch-desktop.git"
},
"dependencies": {
"source-map-support": "^0.5.19"
Expand Down
2 changes: 1 addition & 1 deletion webpack.makeConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const makeConfig = function (defaultConfig, options) {
options: {
modules: true,
importLoaders: 1,
localIdentName: '[name]_[local]_[hash:base64:5]',
// localIdentName: '[name]_[local]_[hash:base64:5]',
camelCase: true
}
}, {
Expand Down

0 comments on commit 4d15309

Please sign in to comment.