Skip to content

Commit da74a8e

Browse files
[PRM-716] Changed pip install logic on ods-downloader (#98)
1 parent f6ef7c6 commit da74a8e

File tree

8 files changed

+29
-31
lines changed

8 files changed

+29
-31
lines changed

.github/workflows/automated-deploy-dashboard-dev.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
run:
2828
working-directory: ./dashboard
2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v6
3131

32-
- name: Setup Node.js
33-
uses: actions/setup-node@v4
32+
- name: Use Node.js 24.x
33+
uses: actions/setup-node@v6
3434
with:
35-
node-version-file: dashboard/.nvmrc
35+
node-version: 24.x
3636
cache: "npm"
3737
cache-dependency-path: dashboard/package-lock.json
3838

@@ -49,12 +49,12 @@ jobs:
4949
working-directory: ./dashboard
5050
needs: test
5151
steps:
52-
- uses: actions/checkout@v4
52+
- uses: actions/checkout@v6
5353

54-
- name: Setup Node.js
55-
uses: actions/setup-node@v4
54+
- name: Use Node.js 24.x
55+
uses: actions/setup-node@v6
5656
with:
57-
node-version-file: dashboard/.nvmrc
57+
node-version: 24.x
5858
cache: "npm"
5959
cache-dependency-path: dashboard/package-lock.json
6060

.github/workflows/automated-deploy-services-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
outputs:
2727
changed: ${{ steps.get-changed-files.outputs.changed }}
2828
steps:
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 0
3232

.github/workflows/automated-sbom-repo-scan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ jobs:
1515
name: SBOM Repo Scan
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919
with:
2020
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2121

22-
- uses: anchore/sbom-action@f8bdd1d8ac5e901a77a92f111440fdb1b593736b # v0.20.6
22+
- uses: anchore/sbom-action@28d71544de8eaf1b958d335707167c5f783590ad # v0.22.2
2323
with:
2424
path: "."
2525
format: cyclonedx-json
2626
output-file: sbom-repo-${{ github.event.repository.name }}-${{ github.sha }}.cdx.json
2727

28-
- uses: anchore/scan-action@f6601287cdb1efc985d6b765bbf99cb4c0ac29d8 # v7.0.0
28+
- uses: anchore/scan-action@7037fa011853d5a11690026fb85feee79f4c946c # v7.3.2
2929
id: sbom-scan
3030
with:
3131
sbom: sbom-repo-${{ github.event.repository.name }}-${{ github.sha }}.cdx.json

.github/workflows/automated-sonarcloud-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
name: SonarCloud
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
with:
2020
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2121

22-
- name: Use Node.js 18.x
23-
uses: actions/setup-node@v4
22+
- name: Use Node.js 24.x
23+
uses: actions/setup-node@v6
2424
with:
25-
node-version-file: dashboard/.nvmrc
25+
node-version: 24.x
2626
cache: "npm"
2727
cache-dependency-path: dashboard/package-lock.json
2828

@@ -61,7 +61,7 @@ jobs:
6161
npm test -- --coverage
6262
6363
- name: SonarQube Cloud Scan
64-
uses: SonarSource/sonarqube-scan-action@fd88b7d7ccbaefd23d8f36f73b59db7a3d246602 # v6.0.0
64+
uses: SonarSource/sonarqube-scan-action@a31c9398be7ace6bbfaf30c0bd5d415f843d45e9 # v7.0.0
6565
env:
6666
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6767
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/deploy-dashboard-dev.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
working-directory: ./dashboard
1919
steps:
2020
- name: Checkout repo
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222

2323
- name: Configure AWS credentials
2424
uses: aws-actions/configure-aws-credentials@v6
@@ -41,10 +41,10 @@ jobs:
4141
echo "::add-mask::$uri"
4242
echo "uri=$uri" >> $GITHUB_OUTPUT
4343
44-
- name: Setup Node
45-
uses: actions/setup-node@v4
44+
- name: Use Node.js 24.x
45+
uses: actions/setup-node@v6
4646
with:
47-
node-version-file: dashboard/.nvmrc
47+
node-version: 24.x
4848
cache: "npm"
4949
cache-dependency-path: dashboard/package-lock.json
5050

@@ -96,7 +96,7 @@ jobs:
9696

9797
dashboard_build_and_deploy:
9898
name: Build and deploy dashboard via dashboard pipeline step function
99-
needs: [ redeploy_gp2gp_infrastructure_step_functions ]
99+
needs: [redeploy_gp2gp_infrastructure_step_functions]
100100
environment: dev
101101
runs-on: ubuntu-latest
102102
steps:
@@ -118,4 +118,3 @@ jobs:
118118
aws stepfunctions start-execution \
119119
--state-machine-arn "arn:aws:states:eu-west-2:${{ steps.credentials.outputs.aws-account-id }}:stateMachine:dashboard-pipeline" \
120120
--input '{"SKIP_METRICS": true,"time": "${{ steps.date.outputs.date }}"}'
121-

.github/workflows/deploy-service-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run:
4545
working-directory: ./services/${{ inputs.service_name }}
4646
steps:
47-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v6
4848

4949
- name: Set up Python 3.14
5050
uses: actions/setup-python@v6
@@ -77,7 +77,7 @@ jobs:
7777
run:
7878
working-directory: ./services/${{ inputs.service_name }}
7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v6
8181

8282
- name: Set up Python 3.14
8383
uses: actions/setup-python@v6

dashboard/.nvmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

services/ods-downloader/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM python:3.14-slim
22

3-
COPY . /prmods
3+
WORKDIR /prmods
4+
COPY ./src ./src
5+
COPY setup.py .
46

57
ARG IMAGE_TAG
68
ENV BUILD_TAG=${IMAGE_TAG}
79

8-
RUN pip install --upgrade pip && \
9-
pip install setuptools && \
10-
cd /prmods && \
11-
python setup.py install
10+
RUN pip install --upgrade pip setuptools wheel && \
11+
pip install .
1212

1313
ENTRYPOINT ["python", "-m", "prmods.pipeline.main"]

0 commit comments

Comments
 (0)