Skip to content

Commit

Permalink
Merge pull request #1237 from complexdatacollective/fix/python3-githu…
Browse files Browse the repository at this point in the history
…b-actions

upgrade to support python 3
  • Loading branch information
jthrilly authored Jun 23, 2023
2 parents 00ee005 + d047000 commit fb6ac09
Show file tree
Hide file tree
Showing 4 changed files with 2,485 additions and 1,243 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Dist
on:
push:
branches:
- 'release/**'
- "release/**"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -17,19 +17,19 @@ jobs:
# Set python version to 2.x due to node-gyp and sass
- uses: actions/setup-python@v4
with:
python-version: '2.7.18'
python-version: "3.10.12"
# Set node version
- uses: actions/setup-node@v2
with:
node-version: '14.21.3'
node-version: "14.21.3"
- name: Set NPM 7
run: npm install -g npm@8.3.2
run: npm install -g npm@8.19.4
# Cache node_modules
- uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: '**/node_modules'
path: "**/node_modules"
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}

- name: Install MDNS build dependencies
Expand Down
20 changes: 9 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI
on:
push:
branches: [ master ]
branches: [master]
pull_request:

# Allows you to run this workflow manually from the Actions tab
Expand All @@ -17,19 +17,19 @@ jobs:
# Set python version to 2.x due to node-gyp and sass
- uses: actions/setup-python@v4
with:
python-version: '2.7.18'
python-version: "3.10.12"
# Set node version
- uses: actions/setup-node@v2
with:
node-version: '14.21.3'
node-version: "14.21.3"
- name: Set NPM 7
run: npm install -g npm@8.3.2
run: npm install -g npm@8.19.4
# Cache node_modules
- uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: '**/node_modules'
path: "**/node_modules"
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}

- name: Install MDNS build dependencies
Expand All @@ -56,19 +56,19 @@ jobs:
# Set python version to 2.x due to node-gyp and sass
- uses: actions/setup-python@v4
with:
python-version: '2.7.18'
python-version: "3.10.12"
# Set node version
- uses: actions/setup-node@v2
with:
node-version: '14.21.3'
node-version: "14.21.3"
- name: Set NPM 7
run: npm install -g npm@8.3.2
run: npm install -g npm@8.19.4
# Cache node_modules
- uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: '**/node_modules'
path: "**/node_modules"
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}

- name: Install MDNS build dependencies
Expand All @@ -81,5 +81,3 @@ jobs:

- name: Build
run: npm run build:electron


Loading

0 comments on commit fb6ac09

Please sign in to comment.