Skip to content

Commit

Permalink
Merge pull request #1035 from Dudrie/fix-ci
Browse files Browse the repository at this point in the history
fix CI (hopefully)
  • Loading branch information
nk-coding authored May 24, 2024
2 parents c8cc96b + 59c8b13 commit a6331d8
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-push-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
node-version: 14.x

- name: Install pnpm
run: npm i -g pnpm
run: npm i -g pnpm@latest-7

# Change the version to be the correct one so the version in the image is always the correct one.
- name: Set new version
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
node-version: 14.x
- name: Install pnpm
run: npm i -g pnpm
run: npm i -g pnpm@latest-7
- name: Install node packages
run: |
pnpm install --frozen-lockfile
Expand All @@ -45,7 +45,7 @@ jobs:
with:
node-version: 14.x
- name: Install pnpm
run: npm i -g pnpm
run: npm i -g pnpm@latest-7
- name: Install node packages
run: |
pnpm install --frozen-lockfile
Expand All @@ -68,7 +68,7 @@ jobs:
with:
node-version: 14.x
- name: Install pnpm
run: npm i -g pnpm
run: npm i -g pnpm@latest-7
- name: Install node packages
run: |
pnpm install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
node-version: 14.x

- name: Install pnpm 🏃‍♀️
run: npm i -g pnpm
run: npm i -g pnpm@latest-7

- name: Install node packages 📦
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
node-version: 14.x
- name: Install pnpm
run: npm i -g pnpm
run: npm i -g pnpm@latest-7
- name: Install node packages
run: |
pnpm install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
with:
node-version: 14.x
- name: Install pnpm
run: npm i -g pnpm
run: npm i -g pnpm@latest-7
- name: Install node packages
run: |
pnpm install --frozen-lockfile
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ WORKDIR /tms/
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
ENV MONGOMS_DISABLE_POSTINSTALL 1

RUN npm install -g pnpm
RUN npm install -g pnpm@latest-7
RUN pnpm install && pnpm build

# =============================================
Expand All @@ -44,7 +44,7 @@ RUN apk add --no-cache \
nodejs \
npm

RUN npm install -g pnpm
RUN npm install -g pnpm@latest-7

COPY --from=build tms/server/dist tms/server

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/dev/setup-env.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ To get started you need a few development tools. The following are required to r
2. Package manager [pnpm](https://pnpm.js.org/en/)
If you have not already you can install `pnpm` with
```cmd
npm install -g pnpm
npm install -g pnpm@latest-7
```

While [Docker](https://docs.docker.com/install/) is not needed it helps you to set up your environment more easily. It's mostly used to spin up a Mongo database on your system in closely to no time. If you don't use Docker you need to provide an alternative MySQL database and to change the configuration in `server/config/development.yml` accordingly.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "3.0.0",
"version": "3.0.2",
"engines": {
"node": ">=14",
"pnpm": ">=5"
Expand Down

0 comments on commit a6331d8

Please sign in to comment.