Skip to content

Commit

Permalink
Update workflows and node version
Browse files Browse the repository at this point in the history
  • Loading branch information
rly committed Jul 30, 2024
1 parent 5c809ec commit 9ce0c62
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 91 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/build_and_deploy_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ jobs:
shell: bash -l {0}

steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v4
with:
python-version: "3.10"
- uses: actions/checkout@v4

- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v3
Expand All @@ -35,11 +31,6 @@ jobs:
- name: Create and activate environment
run: mamba env update --name nwb-guide --file environments/environment-MAC-intel.yml

- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install package.json modules and their dependencies (not via `npm ci`)
run: npm install --verbose

Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/build_and_deploy_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,14 @@ jobs:
shell: bash -l {0}

steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v4
with:
python-version: "3.10"
- uses: actions/checkout@v4

- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: nwb-guide
environment-file: environments/environment-Windows.yml
auto-activate-base: false

- uses: actions/setup-node@v3
with:
node-version: "18"

- name: Install package.json modules and their dependencies
run: npm install --verbose

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request_review' && github.event.review.state == 'approved')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- run: npm ci
- uses: chromaui/action@v1
with:
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/deploy_tests_on_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ concurrency:

jobs:

# DevTests:
# uses: ./.github/workflows/testing_dev.yml
# secrets:
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
DevTests:
uses: ./.github/workflows/testing_dev.yml
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

# LiveServices:
# uses: ./.github/workflows/testing_dev_with_live_services.yml
# secrets:
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
# DANDI_STAGING_API_KEY: ${{ secrets.DANDI_STAGING_API_KEY }}
LiveServices:
uses: ./.github/workflows/testing_dev_with_live_services.yml
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
DANDI_STAGING_API_KEY: ${{ secrets.DANDI_STAGING_API_KEY }}

BuildTests:
uses: ./.github/workflows/testing_flask_build_and_dist.yml

# ExampleDataCache:
# uses: ./.github/workflows/example_data_cache.yml
# secrets:
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
# S3_GIN_BUCKET: ${{ secrets.S3_GIN_BUCKET }}
ExampleDataCache:
uses: ./.github/workflows/example_data_cache.yml
secrets:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
S3_GIN_BUCKET: ${{ secrets.S3_GIN_BUCKET }}

# ExampleDataTests:
# needs: ExampleDataCache
# uses: ./.github/workflows/testing_pipelines.yml
ExampleDataTests:
needs: ExampleDataCache
uses: ./.github/workflows/testing_pipelines.yml
1 change: 0 additions & 1 deletion .github/workflows/example_data_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
os: [ubuntu-latest, windows-latest] #,macos-latest, macos-13]

steps:
Expand Down
21 changes: 7 additions & 14 deletions .github/workflows/testing_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,11 @@ jobs:
- os: ubuntu-latest
label: environments/environment-Linux.yml

# Both Mac versions for dev testing started failing around July 25, 2024
# A similar type of issue to one previously seen
# manifesting as hanging/freezing/stalling during postinstall step of electron
# Last time, manually updating the package-lock.json file was enough to fix the issue
# But that didn't work this time
# - os: macos-latest # Mac arm64 runner
# label: environments/environment-MAC-apple-silicon.yml
#
# - os: macos-13 # Mac x64 runner
# label: environments/environment-MAC-intel.yml
- os: macos-latest # Mac arm64 runner
label: environments/environment-MAC-apple-silicon.yml

- os: macos-13 # Mac x64 runner
label: environments/environment-MAC-intel.yml

# - os: windows-latest
# label: environments/environment-Windows.yml
Expand Down Expand Up @@ -66,10 +61,8 @@ jobs:
name: Create and activate environment
run: mamba env update --name nwb-guide --file ${{ matrix.label }}

- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20
- name: Update npm
run: npm install -g npm@latest

- name: Install GUIDE
run: npm ci --verbose
Expand Down
21 changes: 7 additions & 14 deletions .github/workflows/testing_dev_with_live_services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,11 @@ jobs:
- os: ubuntu-latest
label: environments/environment-Linux.yml

# Both Mac versions for dev testing started failing around July 25, 2024
# A similar type of issue to one previously seen
# manifesting as hanging/freezing/stalling during postinstall step of electron
# Last time, manually updating the package-lock.json file was enough to fix the issue
# But that didn't work this time
# - os: macos-latest # Mac arm64 runner
# label: environments/environment-MAC-apple-silicon.yml
#
# - os: macos-13 # Mac x64 runner
# label: environments/environment-MAC-intel.yml
- os: macos-latest # Mac arm64 runner
label: environments/environment-MAC-apple-silicon.yml

- os: macos-13 # Mac x64 runner
label: environments/environment-MAC-intel.yml

# - os: windows-latest
# label: environments/environment-Windows.yml
Expand Down Expand Up @@ -68,10 +63,8 @@ jobs:
name: Create and activate environment
run: mamba env update -n nwb-guide -f ${{ matrix.label }}

- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20
- name: Update npm
run: npm install -g npm@latest

- name: Install GUIDE
run: npm ci --verbose
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/testing_flask_build_and_dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ jobs:
include:
# No linux in this matrix since installation instructions use dev mode instead of distributable

# Both Mac versions for dev testing started failing around July 25, 2024
# A similar type of issue to one previously seen
# manifesting as hanging/freezing/stalling during postinstall step of electron
# Last time, manually updating the package-lock.json file was enough to fix the issue
# But that didn't work this time
- os: macos-latest # Mac arm64 runner
label: environments/environment-MAC-apple-silicon.yml

Expand Down Expand Up @@ -68,9 +63,11 @@ jobs:
name: Update environment
run: mamba env update -f ${{ matrix.label }}

- run: npm install -g npm@latest
- name: Update npm
run: npm install -g npm@latest

- run: npm ci --verbose
- name: Install GUIDE
run: npm ci --verbose

# Fix for macos build - remove bad sonpy file
- if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
Expand Down
22 changes: 7 additions & 15 deletions .github/workflows/testing_pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,15 @@ jobs:
# - os: ubuntu-latest
# label: environments/environment-Linux.yml

# Both Mac versions for dev testing started failing around July 25, 2024
# A similar type of issue to one previously seen
# manifesting as hanging/freezing/stalling during postinstall step of electron
# Last time, manually updating the package-lock.json file was enough to fix the issue
# But that didn't work this time
# - os: macos-latest # Mac arm64 runner
# label: environments/environment-MAC-apple-silicon.yml
#
# - os: macos-13 # Mac x64 runner
# label: environments/environment-MAC-intel.yml
- os: macos-latest # Mac arm64 runner
label: environments/environment-MAC-apple-silicon.yml

- os: macos-13 # Mac x64 runner
label: environments/environment-MAC-intel.yml

- os: windows-latest
label: environments/environment-Windows.yml


steps:
- uses: actions/checkout@v4
- run: git fetch --prune --unshallow --tags
Expand Down Expand Up @@ -64,10 +58,8 @@ jobs:
name: Create and activate environment
run: mamba env update --name nwb-guide --file ${{ matrix.label }}

# - name: Use Node.js 20
# uses: actions/setup-node@v4
# with:
# node-version: 20
- name: Update npm
run: npm install -g npm@latest

- name: Install GUIDE
run: npm ci --verbose
Expand Down
2 changes: 1 addition & 1 deletion environments/environment-Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- defaults
dependencies:
- python = 3.9.18
- nodejs = 18.16.1
- nodejs = 20.12.2
- numcodecs = 0.11.0
# install these from conda-forge so that dependent packages get included in the distributable
- jsonschema = 4.18.0 # installs jsonschema-specifications
Expand Down
2 changes: 1 addition & 1 deletion environments/environment-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
dependencies:
- python = 3.9.17
- nodejs = 18.16.1
- nodejs = 20.12.2
- pywin32 = 303
- git = 2.20.1
- setuptools = 58.0.4
Expand Down

0 comments on commit 9ce0c62

Please sign in to comment.