Skip to content

Commit 1bbd225

Browse files
committed
Merge branch '2.022.16a' into 3864-permission-sorting-issue
2 parents f68f2f7 + c8c3413 commit 1bbd225

File tree

5 files changed

+18
-4
lines changed

5 files changed

+18
-4
lines changed

.github/workflows/npm-test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ jobs:
1313
- uses: actions/checkout@v2
1414
- uses: actions/setup-node@v2
1515
with:
16-
node-version: '16'
16+
# We need this particular version, as npm 8.5.5 is the last version
17+
# that works with our package.json :sadface:.
18+
node-version: '16.15.0'
1719
cache: 'npm'
1820
- uses: browser-actions/setup-chrome@latest
1921
- run: chrome --version

.github/workflows/pytest.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
- uses: actions/checkout@v2
3939
- uses: actions/setup-node@v2
4040
with:
41-
node-version: '16'
41+
# We need this particular version, as npm 8.5.5 is the last version
42+
# that works with our package.json :sadface:.
43+
node-version: '16.15.0'
4244
cache: 'npm'
4345
- name: Set up Python ${{ matrix.python-version }}
4446
uses: actions/setup-python@v2

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ COPY . "${KPI_SRC_DIR}"
8888

8989
RUN python3 -m venv "$VIRTUAL_ENV"
9090
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
91-
RUN pip install --quiet --upgrade pip && \
92-
pip install --quiet pip-tools
91+
RUN pip install --quiet pip==22.0.4 && \
92+
pip install --quiet pip-tools
9393
COPY ./dependencies/pip/external_services.txt "${TMP_DIR}/pip_dependencies.txt"
9494
RUN pip-sync "${TMP_DIR}/pip_dependencies.txt" 1>/dev/null && \
9595
rm -rf ~/.cache/pip
@@ -101,6 +101,7 @@ RUN pip-sync "${TMP_DIR}/pip_dependencies.txt" 1>/dev/null && \
101101
WORKDIR ${KPI_SRC_DIR}/
102102

103103
RUN rm -rf ${KPI_NODE_PATH} && \
104+
npm install -g [email protected] && \
104105
npm install -g check-dependencies && \
105106
npm install --quiet && \
106107
npm cache clean --force

package-lock.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
"name": "kpi",
33
"version": "2.0.0",
44
"description": "KoboToolbox frontend interface.",
5+
"engineStrict" : true,
6+
"engines": {
7+
"node": "~16.15.0",
8+
"npm": "~8.5.5"
9+
},
510
"dependencies": {
611
"@fontsource/roboto": "^4.4.2",
712
"@fontsource/roboto-mono": "^4.4.2",

0 commit comments

Comments
 (0)