Skip to content

Commit 4d15309

Browse files
author
Ron de las Alas
committed
ci: Configure python 2.7 to so runner is compatible with electron build
1 parent 6adafd7 commit 4d15309

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.github/workflows/ci-cd.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,13 @@ jobs:
4949
run: npm ci
5050
- name: Test
5151
run: npm run test
52+
- name: Install Python 2.7
53+
if: matrix.os == 'macos-latest'
54+
run: |
55+
brew install pyenv
56+
pyenv install 2.7.18
5257
- name: Setup Keys for Fastlane
58+
if: matrix.os == 'macos-latest'
5359
uses: webfactory/[email protected]
5460
with:
5561
ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }}
@@ -65,6 +71,7 @@ jobs:
6571
# macOS CSC info was set by Fastlane above
6672
WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
6773
WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
74+
PYTHON_PATH: /Users/runner/.pyenv/versions/2.7.18/bin/python
6875
run: npm run ${{ vars.SCRATCH_SHOULD_SIGN && 'dist' || 'distDev' }}
6976
- name: Zip MAS-Dev build
7077
if: matrix.os == 'macos-latest'
@@ -74,7 +81,7 @@ jobs:
7481
ditto -v -c -k --sequesterRsrc --keepParent --zlibCompressionLevel 9 \
7582
Scratch*.app ../mas-dev-${NPM_APP_VERSION}.zip
7683
- name: Upload macOS artifacts
77-
uses: actions/upload-artifact@v2
84+
uses: actions/upload-artifact@v3
7885
if: matrix.os == 'macos-latest'
7986
with:
8087
name: macOS

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"repository": {
2424
"type": "git",
25-
"url": "git+ssh://[email protected]/LLK/scratch-desktop.git"
25+
"url": "git+ssh://[email protected]/scratchfoundation/scratch-desktop.git"
2626
},
2727
"dependencies": {
2828
"source-map-support": "^0.5.19"

webpack.makeConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const makeConfig = function (defaultConfig, options) {
8080
options: {
8181
modules: true,
8282
importLoaders: 1,
83-
localIdentName: '[name]_[local]_[hash:base64:5]',
83+
// localIdentName: '[name]_[local]_[hash:base64:5]',
8484
camelCase: true
8585
}
8686
}, {

0 commit comments

Comments
 (0)