diff --git a/.github/workflows/automated-deploy-dashboard-dev.yml b/.github/workflows/automated-deploy-dashboard-dev.yml index 1f7d24b..d1f3c10 100644 --- a/.github/workflows/automated-deploy-dashboard-dev.yml +++ b/.github/workflows/automated-deploy-dashboard-dev.yml @@ -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 @@ -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 diff --git a/.github/workflows/automated-deploy-services-dev.yml b/.github/workflows/automated-deploy-services-dev.yml index eafb9fe..9709a5b 100644 --- a/.github/workflows/automated-deploy-services-dev.yml +++ b/.github/workflows/automated-deploy-services-dev.yml @@ -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 diff --git a/.github/workflows/automated-sbom-repo-scan.yml b/.github/workflows/automated-sbom-repo-scan.yml index bb60d60..2c766cd 100644 --- a/.github/workflows/automated-sbom-repo-scan.yml +++ b/.github/workflows/automated-sbom-repo-scan.yml @@ -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 diff --git a/.github/workflows/automated-sonarcloud-analysis.yml b/.github/workflows/automated-sonarcloud-analysis.yml index cc4106b..eed5b34 100644 --- a/.github/workflows/automated-sonarcloud-analysis.yml +++ b/.github/workflows/automated-sonarcloud-analysis.yml @@ -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 @@ -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 }} diff --git a/.github/workflows/deploy-dashboard-dev.yml b/.github/workflows/deploy-dashboard-dev.yml index 8e5a4d1..9ae402c 100644 --- a/.github/workflows/deploy-dashboard-dev.yml +++ b/.github/workflows/deploy-dashboard-dev.yml @@ -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 @@ -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 @@ -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: @@ -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 }}"}' - diff --git a/.github/workflows/deploy-service-dev.yml b/.github/workflows/deploy-service-dev.yml index a6d8594..70ff3b9 100644 --- a/.github/workflows/deploy-service-dev.yml +++ b/.github/workflows/deploy-service-dev.yml @@ -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 @@ -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 diff --git a/dashboard/.nvmrc b/dashboard/.nvmrc deleted file mode 100644 index b492b08..0000000 --- a/dashboard/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -18.16 diff --git a/services/ods-downloader/Dockerfile b/services/ods-downloader/Dockerfile index 4751f58..9088217 100644 --- a/services/ods-downloader/Dockerfile +++ b/services/ods-downloader/Dockerfile @@ -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"]