Skip to content

Commit

Permalink
Enforce scubaclient version
Browse files Browse the repository at this point in the history
Keep the version from lockfile, pending a proper release.
It also seems "latest" changes cannot be integrated at the moment.

Also, need to use specific version of typescript, as scubaclient does
not (reportedly) support latest releases (5.x).

Issue: CLDSRV-562
  • Loading branch information
francoisferrand authored and Kerkesni committed Oct 1, 2024
1 parent 7e210b6 commit 4635b80
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/actions/setup-ci/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ runs:
with:
node-version: '16'
cache: 'yarn'
- name: install typescript
shell: bash
run: yarn global add [email protected]
- name: install dependencies
shell: bash
run: yarn install --ignore-engines --frozen-lockfile --network-concurrency 1
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ jobs:
with:
node-version: '16'
cache: yarn
- name: install typescript
shell: bash
run: yarn global add [email protected]
- name: install dependencies
run: yarn install --frozen-lockfile --network-concurrency 1
- uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN apt-get update \

ENV PYTHON=python3
COPY package.json yarn.lock /usr/src/app/
RUN npm install typescript -g
RUN npm install typescript@4.9.5 -g
RUN yarn install --production --ignore-optional --frozen-lockfile --ignore-engines --network-concurrency 1

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion images/svc-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN rm -f ~/.gitconfig && \
git config --global --add safe.directory . && \
git lfs install && \
GIT_LFS_SKIP_SMUDGE=1 && \
yarn global add typescript && \
yarn global add typescript@4.9.5 && \
yarn install --frozen-lockfile --production --network-concurrency 1 && \
yarn cache clean --all && \
yarn global remove typescript
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"npm-run-all": "~4.1.5",
"prom-client": "14.2.0",
"request": "^2.81.0",
"scubaclient": "git+https://github.com/scality/scubaclient.git",
"scubaclient": "git+https://github.com/scality/scubaclient.git#fb7375a9298bda7df0e9f9ed81d7fc5b363590a9",
"sql-where-parser": "~2.2.1",
"utapi": "github:scality/utapi#8.1.15",
"utf-8-validate": "^5.0.8",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5302,7 +5302,7 @@ sax@>=0.6.0, sax@^1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==

"scubaclient@git+https://github.com/scality/scubaclient.git":
"scubaclient@git+https://github.com/scality/scubaclient.git#fb7375a9298bda7df0e9f9ed81d7fc5b363590a9":
version "1.0.0"
resolved "git+https://github.com/scality/scubaclient.git#fb7375a9298bda7df0e9f9ed81d7fc5b363590a9"
dependencies:
Expand Down

0 comments on commit 4635b80

Please sign in to comment.