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

feat: upgraded to node v18, added .nvmrc and updated workflows #1729

Merged
merged 22 commits into from
Jul 13, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9838448
feat: upgraded to node v18, added .nvmrc and updated workflows
BilalQamar95 Mar 16, 2023
324ece9
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 Apr 7, 2023
33c9609
refactor: updated packages
BilalQamar95 Apr 7, 2023
2c0aed6
Merge branch 'master' into bilalqamar95/node-v18-upgrade
BilalQamar95 Apr 25, 2023
75d3b1c
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 Apr 25, 2023
0b5f8aa
Merge branch 'master' into bilalqamar95/node-v18-upgrade
abdullahwaheed May 12, 2023
d1ce985
chore: add CHANGELOG and version bump entry for v4.0.0
adamstankiewicz May 12, 2023
28f1fe5
Merge branch 'bilalqamar95/node-v18-upgrade' of https://github.com/op…
BilalQamar95 May 23, 2023
bff0a6d
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 May 23, 2023
5c60b9d
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 May 26, 2023
e1020a0
refactor: updated node version to 18.15 in dockerfile
BilalQamar95 May 26, 2023
6c228a3
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 May 30, 2023
3e9f31f
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 Jun 2, 2023
54dd80d
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 Jun 19, 2023
29fe7a4
chore: re-introduced CHANGELOG and version bump entry for v4.0.0
BilalQamar95 Jun 27, 2023
d642583
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 Jun 27, 2023
b7d34bf
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 Jul 3, 2023
8754389
refactor: added engines field to package file
BilalQamar95 Jul 3, 2023
7f1cbde
Merge branch 'master' of https://github.com/openedx/edx-enterprise in…
BilalQamar95 Jul 12, 2023
0a3520c
Merge branch 'master' into bilalqamar95/node-v18-upgrade
brobro10000 Jul 13, 2023
05decf5
Merge branch 'master' into bilalqamar95/node-v18-upgrade
brobro10000 Jul 13, 2023
4f4ad83
Merge branch 'master' into bilalqamar95/node-v18-upgrade
brobro10000 Jul 13, 2023
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ jobs:
RUNJSHINT: true
steps:
- uses: actions/checkout@v2
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
- uses: actions/setup-python@v2
with:
python-version: '3.8'
architecture: x64
- uses: actions/setup-node@v2
with:
node-version: 16
node-version: ${{ env.NODE_VER }}
- run: pip install -r requirements/ci.txt
- name: Run tox
env:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
- name: setup python
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oof, blast from the past all the way to node 12 haha

node-version: ${{ env.NODE_VER }}
- name: Install requirements
run: make requirements
- name: Build package
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ fix: fixing name of table used by model fetching method
--------
chore: more orphaned content transmission logging

[4.0.0]
-------
feat!: upgraded to Node v18, added .nvmrc and updated workflows.

[3.67.0]
--------
fix: compare lowered input email address to lowered auth user record email address during bulk enrollment.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN pip install nodeenv
# Must be done after Python requirements, since nodeenv is installed
# via pip.
# The node environment is already 'activated' because its .../bin was put on $PATH.
RUN nodeenv /edx/app/nodeenv --node=16.15.1 --prebuilt
RUN nodeenv /edx/app/nodeenv --node=18.15 --prebuilt

RUN mkdir -p /edx/var/log

Expand Down
2 changes: 1 addition & 1 deletion enterprise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
Your project description goes here.
"""

__version__ = "3.67.4"
__version__ = "4.0.0"

default_app_config = "enterprise.apps.EnterpriseConfig"
Loading