Skip to content

Commit

Permalink
Merge pull request #1835 from 4dn-dcic/node18_upgrade
Browse files Browse the repository at this point in the history
Node v18 Upgrade
  • Loading branch information
utku-ozturk authored Sep 1, 2023
2 parents 154f7aa + c995dd9 commit 3eb5d07
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
jobs:
# This workflow contains a single job called "build"
build:
name: Test Suite for fourfront (Python 3.8, Node 16)
name: Test Suite for fourfront (Python 3.8, Node 18)

# The type of runner that the job will run on
runs-on: ubuntu-20.04
Expand All @@ -28,7 +28,7 @@ jobs:
test_type: ['UNIT', 'NPM', 'Docker']
# We are really not set up for these next two to be multiplicative, so be careful adding more.
python_version: ['3.8']
node_version: ['16']
node_version: ['18']

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down Expand Up @@ -125,8 +125,8 @@ jobs:
poetry run wipe-test-indices $TEST_JOB_ID search-fourfront-testing-opensearch-kqm7pliix4wgiu4druk2indorq.us-east-1.es.amazonaws.com:443
- name: Docker Build
if: ${{ matrix.test_type == 'Docker' && matrix.node_version == '16' && matrix.python_version == '3.8' }}
if: ${{ matrix.test_type == 'Docker' && matrix.node_version == '18' && matrix.python_version == '3.8' }}
run: |
# The docker_development.ini has node 16 and Python 3.8 wired into it.
# The docker_development.ini has node 18 and Python 3.8 wired into it.
touch deploy/docker/local/docker_development.ini # cheap substitute for prepare-docker to make ignored file
docker build .
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ fourfront
Change Log
----------

6.3.0
=====

`Node v18 Upgrade <https://github.com/4dn-dcic/fourfront/pull/1835>`_

* Node in Docker make file and GA workflows migrated from v16 to v18


6.2.2
=====

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ENV NGINX_USER=nginx \
PIP_DISABLE_PIP_VERSION_CHECK=on \
PIP_DEFAULT_TIMEOUT=100 \
NVM_VERSION=v0.39.1 \
NODE_VERSION=16.14.0
NODE_VERSION=18.17.0

# Configure Python3.7 venv
ENV VIRTUAL_ENV=/opt/venv
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool.poetry]
# Note: Various modules refer to this system as "encoded", not "fourfront".
name = "encoded"
version = "6.2.2"
version = "6.3.0"
description = "4DN-DCIC Fourfront"
authors = ["4DN-DCIC Team <[email protected]>"]
license = "MIT"
Expand Down

0 comments on commit 3eb5d07

Please sign in to comment.