Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release branch for 6.4.4 #803

Merged
merged 9 commits into from
May 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ on:

jobs:
dist:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive

# Set python version to 2.x due to node-gyp and sass
- uses: actions/setup-python@v4
with:
python-version: '2.7.18'
# Set node version
- uses: actions/setup-node@v2
with:
node-version: '12.14.1'
node-version: '14.21.3'
- name: Set NPM 7
run: npm install -g npm@7.6.3
run: npm install -g npm@8.3.2
# Cache node_modules
- uses: actions/cache@v2
env:
Expand Down
41 changes: 21 additions & 20 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ on:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive

# Set python version to 2.x due to node-gyp and sass
- uses: actions/setup-python@v4
with:
python-version: '2.7.18'
# Set node version
- uses: actions/setup-node@v2
with:
node-version: '12.14.1'

# Set npm version
node-version: '14.21.3'
- name: Set NPM 7
run: npm install -g npm@7.6.3

run: npm install -g npm@8.3.2
# Cache node_modules
- uses: actions/cache@v2
env:
Expand All @@ -38,26 +38,29 @@ jobs:
- name: Install node modules
run: npm install

- name: Lint and test
run: npm run preflight
- name: Lint
run: npm run lint -- --max-warnings 0 && npm run sass-lint -- --max-warnings 0

- name: Run tests
run: npm run test

build:
needs: test
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive

# Set python version to 2.x due to node-gyp and sass
- uses: actions/setup-python@v4
with:
python-version: '2.7.18'
# Set node version
- uses: actions/setup-node@v2
with:
node-version: '12.14.1'

# Set npm version
node-version: '14.21.3'
- name: Set NPM 7
run: npm install -g npm@7.6.3

run: npm install -g npm@8.3.2
# Cache node_modules
- uses: actions/cache@v2
env:
Expand All @@ -74,5 +77,3 @@ jobs:

- name: Build
run: npm run build


19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ React Scripts

## Node/NPM Version

This project currently requires version `12.14.1` of node, and version `6.13.4` of npm. These are the only supported versions for this project.
This project currently requires version `14.21.3` of node, and version `8.3.2` of npm. These are the only supported versions for this project.

As a convenience, the repository contains a `.node-version` file that enables convinient use of a node environment manager.

Expand Down
2 changes: 1 addition & 1 deletion build-resources/scripts/afterSignHook.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ async function note(params) {
appBundleId: 'NetworkCanvasArchitect',
appPath,
appleId: 'developers@coda.co',
appleIdPassword: '@keychain:altoolpw',
appleIdPassword: '@keychain:AC_PASSWORD',
});
} catch (error) {
console.error(error);
Expand Down
2 changes: 1 addition & 1 deletion network-canvas
Loading
Loading