scratchfoundation/scratch-desktop
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-desktop.git synced 2025-01-08 13:41:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: Configure python 2.7 to so runner is compatible with electron build

Browse source
This commit is contained in:
Ron de las Alas 2023-11-16 12:50:03 -05:00
parent 6adafd7134
commit 4d15309414
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,13 @@ jobs:
run: npm ci run: npm ci
- name: Test - name: Test
run: npm run 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 - name: Setup Keys for Fastlane
if: matrix.os == 'macos-latest'
uses: webfactory/ssh-agent@v0.7.0 uses: webfactory/ssh-agent@v0.7.0
with: with:
ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }} ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }}
@ -65,6 +71,7 @@ jobs:
# macOS CSC info was set by Fastlane above # macOS CSC info was set by Fastlane above
WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} 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' }} run: npm run ${{ vars.SCRATCH_SHOULD_SIGN && 'dist' || 'distDev' }}
- name: Zip MAS-Dev build - name: Zip MAS-Dev build
if: matrix.os == 'macos-latest' if: matrix.os == 'macos-latest'
@ -74,7 +81,7 @@ jobs:
ditto -v -c -k --sequesterRsrc --keepParent --zlibCompressionLevel 9 \ ditto -v -c -k --sequesterRsrc --keepParent --zlibCompressionLevel 9 \
Scratch*.app ../mas-dev-${NPM_APP_VERSION}.zip Scratch*.app ../mas-dev-${NPM_APP_VERSION}.zip
- name: Upload macOS artifacts - name: Upload macOS artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
if: matrix.os == 'macos-latest' if: matrix.os == 'macos-latest'
with: with:
name: macOS name: macOS

2
package.json
View file

@ -22,7 +22,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+ssh://git@github.com/LLK/scratch-desktop.git" "url": "git+ssh://git@github.com/scratchfoundation/scratch-desktop.git"
}, },
"dependencies": { "dependencies": {
"source-map-support": "^0.5.19" "source-map-support": "^0.5.19"

2
webpack.makeConfig.js
View file

@ -80,7 +80,7 @@ const makeConfig = function (defaultConfig, options) {
options: { options: {
modules: true, modules: true,
importLoaders: 1, importLoaders: 1,
localIdentName: '[name]_[local]_[hash:base64:5]', // localIdentName: '[name]_[local]_[hash:base64:5]',
camelCase: true camelCase: true
} }
}, { }, {