Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .github/workflows/automated-deploy-dashboard-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
run:
working-directory: ./dashboard
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup Node.js
uses: actions/setup-node@v4
- name: Use Node.js 24.x
uses: actions/setup-node@v6
with:
node-version-file: dashboard/.nvmrc
node-version: 24.x
cache: "npm"
cache-dependency-path: dashboard/package-lock.json

Expand All @@ -49,12 +49,12 @@ jobs:
working-directory: ./dashboard
needs: test
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup Node.js
uses: actions/setup-node@v4
- name: Use Node.js 24.x
uses: actions/setup-node@v6
with:
node-version-file: dashboard/.nvmrc
node-version: 24.x
cache: "npm"
cache-dependency-path: dashboard/package-lock.json

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automated-deploy-services-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
outputs:
changed: ${{ steps.get-changed-files.outputs.changed }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/automated-sbom-repo-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
name: SBOM Repo Scan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

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

- uses: anchore/scan-action@f6601287cdb1efc985d6b765bbf99cb4c0ac29d8 # v7.0.0
- uses: anchore/scan-action@7037fa011853d5a11690026fb85feee79f4c946c # v7.3.2
id: sbom-scan
with:
sbom: sbom-repo-${{ github.event.repository.name }}-${{ github.sha }}.cdx.json
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/automated-sonarcloud-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
name: SonarCloud
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Use Node.js 18.x
uses: actions/setup-node@v4
- name: Use Node.js 24.x
uses: actions/setup-node@v6
with:
node-version-file: dashboard/.nvmrc
node-version: 24.x
cache: "npm"
cache-dependency-path: dashboard/package-lock.json

Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
npm test -- --coverage

- name: SonarQube Cloud Scan
uses: SonarSource/sonarqube-scan-action@fd88b7d7ccbaefd23d8f36f73b59db7a3d246602 # v6.0.0
uses: SonarSource/sonarqube-scan-action@a31c9398be7ace6bbfaf30c0bd5d415f843d45e9 # v7.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
11 changes: 5 additions & 6 deletions .github/workflows/deploy-dashboard-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
working-directory: ./dashboard
steps:
- name: Checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v6
Expand All @@ -41,10 +41,10 @@ jobs:
echo "::add-mask::$uri"
echo "uri=$uri" >> $GITHUB_OUTPUT

- name: Setup Node
uses: actions/setup-node@v4
- name: Use Node.js 24.x
uses: actions/setup-node@v6
with:
node-version-file: dashboard/.nvmrc
node-version: 24.x
cache: "npm"
cache-dependency-path: dashboard/package-lock.json

Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:

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

4 changes: 2 additions & 2 deletions .github/workflows/deploy-service-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run:
working-directory: ./services/${{ inputs.service_name }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set up Python 3.14
uses: actions/setup-python@v6
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
run:
working-directory: ./services/${{ inputs.service_name }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set up Python 3.14
uses: actions/setup-python@v6
Expand Down
1 change: 0 additions & 1 deletion dashboard/.nvmrc

This file was deleted.

10 changes: 5 additions & 5 deletions services/ods-downloader/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM python:3.14-slim

COPY . /prmods
WORKDIR /prmods
COPY ./src ./src
COPY setup.py .

ARG IMAGE_TAG
ENV BUILD_TAG=${IMAGE_TAG}

RUN pip install --upgrade pip && \
pip install setuptools && \
cd /prmods && \
python setup.py install
RUN pip install --upgrade pip setuptools wheel && \
pip install .

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